diff --git a/package-lock.json b/package-lock.json
index eea517007..3752b1b3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@timechimp/tacugama",
-  "version": "14.2.0",
+  "version": "14.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@timechimp/tacugama",
-      "version": "14.2.0",
+      "version": "14.3.0",
       "license": "MIT",
       "dependencies": {
         "@ag-grid-community/client-side-row-model": "25.0.1",
diff --git a/package.json b/package.json
index bdd5f142e..2665b6f22 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "14.2.0",
+  "version": "14.3.0",
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/src/components/data-grid/DataGrid.tsx b/src/components/data-grid/DataGrid.tsx
index 996351d88..d4e4f87f7 100755
--- a/src/components/data-grid/DataGrid.tsx
+++ b/src/components/data-grid/DataGrid.tsx
@@ -897,7 +897,7 @@ export const DataGrid = ({
                 onBulkDelete={onBulkDelete}
                 hideDownload={hideDownload}
                 hideDelete={hideDelete}
-                showExportTooltip={!!selectedGroupOption}
+                showExportTooltip={!!selectedGroupOption || rowsSelected > 0}
               />
             )}
             <FlexItem width="auto" gap={scale300}>
diff --git a/src/components/data-grid/DataGridActions.tsx b/src/components/data-grid/DataGridActions.tsx
index 760024ed1..453f1b97e 100755
--- a/src/components/data-grid/DataGridActions.tsx
+++ b/src/components/data-grid/DataGridActions.tsx
@@ -63,6 +63,18 @@ export const DataGridActions = ({
     return null;
   }
 
+  const getToolTipText = () => {
+    if (!showExportTooltip) {
+      return '';
+    }
+
+    if (rowsSelected) {
+      return translations.exportTooltipGrouping;
+    }
+
+    return translations.exportTooltipNoSelection;
+  };
+
   return (
     <StyledDataGridActions>
       {!hideDelete && onBulkDelete ? (
@@ -89,7 +101,7 @@ export const DataGridActions = ({
           >
             <Button kind={ButtonKind.tertiary} disabled={!rowsSelected} testId={EXPORT_BUTTON_TEST_ID}>
               <StatefulTooltip
-                content={showExportTooltip ? translations.exportTooltip : ''}
+                content={getToolTipText()}
                 showArrow={true}
                 placement="top"
                 overrides={{
diff --git a/src/components/data-grid/defaultTranslations.tsx b/src/components/data-grid/defaultTranslations.tsx
index edba68a8c..69c70d33b 100755
--- a/src/components/data-grid/defaultTranslations.tsx
+++ b/src/components/data-grid/defaultTranslations.tsx
@@ -60,5 +60,6 @@ export const defaultTranslations: Translations = {
   emptyGroup: {
     teamName: 'No team',
   },
-  exportTooltip: 'Change the “Group by” dropdown to “None” to be able to export the employee insights.',
+  exportTooltipGrouping: 'Change the “Group by” dropdown to “None” to be able to export.',
+  exportTooltipNoSelection: 'Select at least one row to make an export.',
 };
diff --git a/src/components/data-grid/types.ts b/src/components/data-grid/types.ts
index f922d7e33..775bd1c01 100755
--- a/src/components/data-grid/types.ts
+++ b/src/components/data-grid/types.ts
@@ -193,7 +193,8 @@ export interface Translations {
   clearFilters: string;
   add: string;
   emptyGroup: EmptyGroup;
-  exportTooltip: string;
+  exportTooltipGrouping: string;
+  exportTooltipNoSelection: string;
 }
 
 export interface DataGridSetting {