diff --git a/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx b/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
index 3553f145fcead..0e16d569021d8 100644
--- a/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
+++ b/x-pack/plugins/ml/public/application/components/ml_page/ml_page.tsx
@@ -128,6 +128,7 @@ export const MlPage: FC<{ pageDeps: PageDependencies }> = React.memo(({ pageDeps
         className={'ml-app'}
         data-test-subj={'mlApp'}
         restrictWidth={false}
+        panelled
         solutionNav={
           showMLNavMenu
             ? {
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/datafeed_preview_tab.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/datafeed_preview_tab.tsx
index 7fa4d0c289a5f..b9813ece905f4 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/datafeed_preview_tab.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/datafeed_preview_tab.tsx
@@ -9,6 +9,7 @@ import type { FC } from 'react';
 import React, { useEffect, useState } from 'react';
 import { EuiCallOut, EuiLoadingSpinner } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { useEnabledFeatures } from '../../../../contexts/ml';
 import { ML_DATA_PREVIEW_COUNT } from '../../../../../../common/util/job_utils';
 import { useMlApiContext } from '../../../../contexts/kibana';
 import { usePermissionCheck } from '../../../../capabilities/check_capabilities';
@@ -23,6 +24,7 @@ export const DatafeedPreviewPane: FC<Props> = ({ job }) => {
   const {
     jobs: { datafeedPreview },
   } = useMlApiContext();
+  const { showNodeInfo } = useEnabledFeatures();
 
   const canPreviewDatafeed = usePermissionCheck('canPreviewDatafeed');
   const [loading, setLoading] = useState(false);
@@ -54,7 +56,7 @@ export const DatafeedPreviewPane: FC<Props> = ({ job }) => {
   ) : (
     <>
       {previewJson === null ? (
-        <EmptyResults />
+        <EmptyResults showFrozenTierText={showNodeInfo === true} />
       ) : (
         <MLJobEditor value={previewJson} readOnly={true} />
       )}
@@ -82,7 +84,7 @@ const InsufficientPermissions: FC = () => (
   </EuiCallOut>
 );
 
-const EmptyResults: FC = () => (
+const EmptyResults: FC<{ showFrozenTierText: boolean }> = ({ showFrozenTierText }) => (
   <EuiCallOut
     title={
       <FormattedMessage
@@ -93,11 +95,13 @@ const EmptyResults: FC = () => (
     color="warning"
     iconType="warning"
   >
-    <p>
-      <FormattedMessage
-        id="xpack.ml.jobsList.jobDetails.noResults.text"
-        defaultMessage="Note: Datafeed preview does not return results from frozen tiers."
-      />
-    </p>
+    {showFrozenTierText ? (
+      <p>
+        <FormattedMessage
+          id="xpack.ml.jobsList.jobDetails.noResults.text"
+          defaultMessage="Note: Datafeed preview does not return results from frozen tiers."
+        />
+      </p>
+    ) : null}
   </EuiCallOut>
 );