diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/extract_job_details.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/extract_job_details.js
index 50e5aeeb29dd9..8f89c4a049189 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/extract_job_details.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/extract_job_details.js
@@ -133,7 +133,7 @@ export function extractJobDetails(job) {
       defaultMessage: 'Datafeed',
     }),
     position: 'left',
-    items: filterObjects(job.datafeed_config, true, true),
+    items: filterObjects(job.datafeed_config || {}, true, true),
   };
   if (job.node) {
     datafeed.items.push(['node', JSON.stringify(job.node)]);
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
index 0375997b86bb8..56da4f1e0ff84 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js
@@ -125,7 +125,7 @@ export class JobDetails extends Component {
         },
       ];
 
-      if (showFullDetails) {
+      if (showFullDetails && datafeed.items.length) {
         // Datafeed should be at index 2 in tabs array for full details
         tabs.splice(2, 0, {
           id: 'datafeed',