diff --git a/plugins/main/public/components/common/tables/components/export-table-csv.tsx b/plugins/main/public/components/common/tables/components/export-table-csv.tsx
index d4bc30b2dc..b31253c295 100644
--- a/plugins/main/public/components/common/tables/components/export-table-csv.tsx
+++ b/plugins/main/public/components/common/tables/components/export-table-csv.tsx
@@ -13,7 +13,8 @@
 import React from 'react';
 import {
   EuiFlexItem,
-  EuiButtonEmpty
+  EuiButtonEmpty,
+  EuiIconTip
 } from '@elastic/eui';
 import exportCsv from '../../../../react-services/wz-csv';
 import { getToasts }  from '../../../../kibana-services';
@@ -21,7 +22,7 @@ import { UI_ERROR_SEVERITIES } from '../../../../react-services/error-orchestrat
 import { UI_LOGGER_LEVELS } from '../../../../../common/constants';
 import { getErrorOrchestrator } from '../../../../react-services/common-services';
 
-export function ExportTableCsv({ endpoint, totalItems, filters, title }) {
+export function ExportTableCsv({ endpoint, totalItems, filters, title, maxRows }) {
 
   const showToast = (color, title, time) => {
     getToasts().add({
@@ -56,10 +57,16 @@ export function ExportTableCsv({ endpoint, totalItems, filters, title }) {
       getErrorOrchestrator().handleError(options);
     }
   }
-  
+
   return <EuiFlexItem grow={false}>
   <EuiButtonEmpty isDisabled={(totalItems == 0)} iconType="importAction" onClick={() => downloadCsv()}>
     Export formatted
+  {totalItems > maxRows&&<> <EuiIconTip
+          content={`The exported CSV will be limited to the first ${maxRows} lines. You can change this limit in Dashboard management > App Settings`}
+          size='m'
+          color='primary'
+          type='iInCircle'
+        /></>}
   </EuiButtonEmpty>
     </EuiFlexItem>
 }
@@ -70,4 +77,4 @@ ExportTableCsv.defaultProps = {
     totalItems:0,
     filters: [],
     title:""
-  };
\ No newline at end of file
+  };
diff --git a/plugins/main/public/components/common/tables/table-wz-api.tsx b/plugins/main/public/components/common/tables/table-wz-api.tsx
index c1a2aa62f5..6746b0bc3b 100644
--- a/plugins/main/public/components/common/tables/table-wz-api.tsx
+++ b/plugins/main/public/components/common/tables/table-wz-api.tsx
@@ -21,7 +21,6 @@ import {
   EuiToolTip,
   EuiIcon,
   EuiCheckboxGroup,
-  EuiIconTip,
 } from '@elastic/eui';
 import { TableWithSearchBar } from './table-with-search-bar';
 import { TableDefault } from './table-default';
@@ -252,15 +251,9 @@ export function TableWzAPI({
                       ? rest.downloadCsv
                       : rest.title
                   }
+                  maxRows={maxRows}
                 />
-                {totalItems > maxRows && (
-                  <EuiIconTip
-                    content={`The exported CSV will be limited to the first ${maxRows} lines. You can change this limit in Dashboard management > App Settings`}
-                    size='m'
-                    color='primary'
-                    type='iInCircle'
-                  />
-                )}
+
               </>
             )}
             {/* Render optional post custom action button */}