diff --git a/src/plugins/vis_type_tagcloud/public/tag_cloud_type.ts b/src/plugins/vis_type_tagcloud/public/tag_cloud_type.ts
index 114ca5cdb0e346..d4c37649f949d5 100644
--- a/src/plugins/vis_type_tagcloud/public/tag_cloud_type.ts
+++ b/src/plugins/vis_type_tagcloud/public/tag_cloud_type.ts
@@ -120,5 +120,4 @@ export const tagCloudVisTypeDefinition = {
       },
     ]),
   },
-  useCustomNoDataScreen: true,
 };
diff --git a/src/plugins/vis_type_tagcloud/public/tag_cloud_vis_renderer.tsx b/src/plugins/vis_type_tagcloud/public/tag_cloud_vis_renderer.tsx
index f8761fb445a995..4cc1542e0b3c04 100644
--- a/src/plugins/vis_type_tagcloud/public/tag_cloud_vis_renderer.tsx
+++ b/src/plugins/vis_type_tagcloud/public/tag_cloud_vis_renderer.tsx
@@ -20,6 +20,7 @@
 import React, { lazy, Suspense } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { EuiLoadingSpinner } from '@elastic/eui';
+import { get } from 'lodash';
 
 import { VisualizationContainer } from '../../visualizations/public';
 import { ExpressionRenderDefinition } from '../../expressions/common/expression_renderers';
@@ -41,7 +42,7 @@ export const getTagCloudVisRenderer: (
     });
 
     render(
-      <VisualizationContainer>
+      <VisualizationContainer showNoResults={config.visData?.rows?.length === 0}>
         <Suspense fallback={<EuiLoadingSpinner />}>
           <TagCloudChart
             {...config}
diff --git a/src/plugins/visualizations/public/components/visualization_container.tsx b/src/plugins/visualizations/public/components/visualization_container.tsx
index d6f87d4cea123e..12f27d694898b8 100644
--- a/src/plugins/visualizations/public/components/visualization_container.tsx
+++ b/src/plugins/visualizations/public/components/visualization_container.tsx
@@ -18,13 +18,19 @@
  */
 
 import React, { ReactNode } from 'react';
+import { VisualizationNoResults } from './visualization_noresults';
 
 interface VisualizationContainerProps {
   className?: string;
   children: ReactNode;
+  showNoResults?: boolean;
 }
 
-export const VisualizationContainer = (props: VisualizationContainerProps) => {
-  const classes = `visualization ${props.className}`;
-  return <div className={classes}>{props.children}</div>;
+export const VisualizationContainer = ({
+  className = '',
+  children,
+  showNoResults = false,
+}: VisualizationContainerProps) => {
+  const classes = `visualization ${className}`;
+  return <div className={classes}>{showNoResults ? <VisualizationNoResults /> : children}</div>;
 };