diff --git a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
index 282cbc59b5..23f9af445c 100644
--- a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
+++ b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
@@ -109,20 +109,27 @@ const generatedColumns: TableColumn[] = [
     title: 'Build',
     field: 'buildName',
     highlight: true,
-    render: (row: Partial<CITableBuildInfo>) => (
-      <Link
-        component={RouterLink}
-        to={generatePath(buildRouteRef.path, {
-          branch: row.source?.branchName!,
-          buildNumber: row.buildNumber?.toString()!,
-        })}
-      >
-        {row.buildName}
-      </Link>
-    ),
+    render: (row: Partial<CITableBuildInfo>) => {
+      if (!row.source?.branchName || !row.buildNumber) {
+        return <>{row.buildName}</>;
+      }
+
+      return (
+        <Link
+          component={RouterLink}
+          to={generatePath(buildRouteRef.path, {
+            branch: row.source.branchName,
+            buildNumber: row.buildNumber.toString(),
+          })}
+        >
+          {row.buildName}
+        </Link>
+      );
+    },
   },
   {
     title: 'Source',
+    field: 'source.branchName',
     render: (row: Partial<CITableBuildInfo>) => (
       <>
         <p>
@@ -136,6 +143,7 @@ const generatedColumns: TableColumn[] = [
   },
   {
     title: 'Status',
+    field: 'status',
     render: (row: Partial<CITableBuildInfo>) => {
       return (
         <Box display="flex" alignItems="center">
@@ -146,6 +154,7 @@ const generatedColumns: TableColumn[] = [
   },
   {
     title: 'Tests',
+    sorting: false,
     render: (row: Partial<CITableBuildInfo>) => {
       return (
         <>
@@ -168,6 +177,7 @@ const generatedColumns: TableColumn[] = [
   },
   {
     title: 'Actions',
+    sorting: false,
     render: (row: Partial<CITableBuildInfo>) => (
       <IconButton onClick={row.onRestartClick}>
         <RetryIcon />