diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTable/index.tsx b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTable/index.tsx
index 17e2758c1055..2798e431599f 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTable/index.tsx
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/AgGridTable/index.tsx
@@ -480,7 +480,7 @@ const AgGridDataTable: FunctionComponent<AgGridTableProps> = memo(
           )}
           {includeSearch && (
             <div className="search-container">
-              {serverPagination && (
+              {serverPagination && searchOptions?.length > 0 && (
                 <div className="search-by-text-container">
                   <span className="search-by-text"> {t('Search by')}:</span>
                   <SearchSelectDropdown
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useColDefs.ts b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useColDefs.ts
index d216165f8d1e..cda6891f5292 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useColDefs.ts
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/src/utils/useColDefs.ts
@@ -18,7 +18,12 @@
  * under the License.
  */
 import { t } from '@apache-superset/core/translation';
-import { ColDef } from '@superset-ui/core/components/ThemedAgGridReact';
+import {
+  ColDef,
+  ValueFormatterParams,
+  ValueGetterParams,
+  CellClassParams,
+} from '@superset-ui/core/components/ThemedAgGridReact';
 import { useCallback, useMemo } from 'react';
 import { DataRecord, DataRecordValue, JsonObject } from '@superset-ui/core';
 import { GenericDataType } from '@apache-superset/core/common';
@@ -291,9 +296,9 @@ export const useColDefs = ({
         field: colId,
         headerName: getHeaderLabel(col),
         headerTooltip: col.description,
-        valueFormatter: p => valueFormatter(p, col),
-        valueGetter: p => valueGetter(p, col),
-        cellStyle: p => {
+        valueFormatter: (p: ValueFormatterParams) => valueFormatter(p, col),
+        valueGetter: (p: ValueGetterParams) => valueGetter(p, col),
+        cellStyle: (p: CellClassParams) => {
           const cellSurfaceColor =
             p.node?.rowPinned != null
               ? theme.colorBgBase
@@ -317,7 +322,7 @@ export const useColDefs = ({
 
           return getCellStyle(cellStyleParams);
         },
-        cellClass: p =>
+        cellClass: (p: CellClassParams) =>
           getCellClass({
             ...p,
             col,
@@ -479,7 +484,7 @@ export const useColDefs = ({
       headerName: t('№'),
       headerClass: 'ag-header-center',
       field: ROW_NUMBER_COL_ID,
-      valueGetter: params => {
+      valueGetter: (params: ValueGetterParams) => {
         if (params.node?.rowPinned != null) return '';
         if (serverPagination && serverPaginationData) {
           return currentPage * pageSize + (params.node?.rowIndex ?? 0) + 1;
diff --git a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/AgGridTableChart.test.tsx b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/AgGridTableChart.test.tsx
index 9e233e535433..5babc651906c 100644
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/test/AgGridTableChart.test.tsx
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/test/AgGridTableChart.test.tsx
@@ -195,6 +195,119 @@ test('AgGridTableChart renders with search enabled', async () => {
   expect(searchInput).toHaveAttribute('id', 'filter-text-box');
 });
 
+test('AgGridTableChart hides Search by dropdown if includeSearch is false', async () => {
+  const props = transformProps({
+    ...testData.basic,
+    rawFormData: {
+      ...testData.basic.rawFormData,
+      server_pagination: true,
+      include_search: false,
+    },
+  });
+  props.serverPagination = true;
+  props.includeSearch = false;
+
+  render(
+    ProviderWrapper({
+      children: (
+        <AgGridTableChart
+          {...props}
+          setDataMask={mockSetDataMask}
+          slice_id={1}
+        />
+      ),
+    }),
+  );
+
+  await waitFor(() => {
+    const grid = document.querySelector('.ag-container');
+    expect(grid).toBeInTheDocument();
+  });
+
+  expect(screen.queryByText(/Search by/i)).not.toBeInTheDocument();
+});
+
+test('AgGridTableChart renders Search by dropdown if includeSearch is true and there are search options', async () => {
+  const props = transformProps({
+    ...testData.basic,
+    rawFormData: {
+      ...testData.basic.rawFormData,
+      server_pagination: true,
+      include_search: true,
+    },
+  });
+  props.serverPagination = true;
+  props.includeSearch = true;
+
+  render(
+    ProviderWrapper({
+      children: (
+        <AgGridTableChart
+          {...props}
+          setDataMask={mockSetDataMask}
+          slice_id={1}
+        />
+      ),
+    }),
+  );
+
+  await waitFor(() => {
+    const grid = document.querySelector('.ag-container');
+    expect(grid).toBeInTheDocument();
+  });
+
+  expect(screen.getByText(/Search by/i)).toBeInTheDocument();
+});
+
+test('AgGridTableChart does not render Search by dropdown if includeSearch is true but searchOptions is empty', async () => {
+  const noStringColumnsData = {
+    ...testData.basic,
+    queriesData: [
+      {
+        ...testData.basic.queriesData[0],
+        colnames: ['__timestamp', 'sum__num'],
+        coltypes: [GenericDataType.Temporal, GenericDataType.Numeric],
+        data: [
+          {
+            __timestamp: '2020-01-01T12:34:56',
+            sum__num: 2467063,
+          },
+        ],
+      },
+    ],
+  };
+
+  const props = transformProps({
+    ...noStringColumnsData,
+    rawFormData: {
+      ...noStringColumnsData.rawFormData,
+      server_pagination: true,
+      include_search: true,
+    },
+  });
+  props.serverPagination = true;
+  props.includeSearch = true;
+
+  render(
+    ProviderWrapper({
+      children: (
+        <AgGridTableChart
+          {...props}
+          setDataMask={mockSetDataMask}
+          slice_id={1}
+        />
+      ),
+    }),
+  );
+
+  await waitFor(() => {
+    const grid = document.querySelector('.ag-container');
+    expect(grid).toBeInTheDocument();
+  });
+
+  expect(screen.queryByText(/Search by/i)).not.toBeInTheDocument();
+});
+
 test('AgGridTableChart renders with totals', async () => {
   const props = transformProps({
     ...testData.basic,
diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx
index d356f6d4a869..19d06b31a44f 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx
@@ -582,7 +582,7 @@ export default typedMemo(function DataTable<D extends object>({
             <Flex wrap align="center" gap="middle">
               {searchInput && (
                 <>
-                  {serverPagination && (
+                  {serverPagination && searchOptions?.length > 0 && (
                     <Space direction="vertical" size={4}>
                       {t('Search by')}
                       <SearchSelectDropdown
diff --git a/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx b/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
index ddfc27e59577..80bcdfa606ef 100644
--- a/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/test/TableChart.test.tsx
@@ -2383,6 +2383,56 @@ describe('plugin-chart-table', () => {
       expect(filters[0].val).toEqual(['Michael']);
     });
   });
+
+  test('does not render "Search by" if there are no search options (server pagination enabled)', () => {
+    const props = transformProps({
+      ...testData.raw,
+      rawFormData: {
+        ...testData.raw.rawFormData,
+        server_pagination: true,
+        include_search: true,
+      },
+      queriesData: [
+        {
+          ...testData.raw.queriesData[0],
+          colnames: ['num'],
+          coltypes: [GenericDataType.Numeric],
+          data: [{ num: 1 }, { num: 2 }],
+        },
+      ],
+    });
+    render(
+      ProviderWrapper({
+        children: <TableChart {...props} sticky={false} />,
+      }),
+    );
+    expect(screen.queryByText('Search by')).not.toBeInTheDocument();
+  });
+
+  test('renders "Search by" if include_search is true and there are search options (server pagination enabled)', () => {
+    const props = transformProps({
+      ...testData.raw,
+      rawFormData: {
+        ...testData.raw.rawFormData,
+        server_pagination: true,
+        include_search: true,
+      },
+      queriesData: [
+        {
+          ...testData.raw.queriesData[0],
+          colnames: ['name'],
+          coltypes: [GenericDataType.String],
+          data: [{ name: 'Michael' }, { name: 'John' }],
+        },
+      ],
+    });
+    render(
+      ProviderWrapper({
+        children: <TableChart {...props} sticky={false} />,
+      }),
+    );
+    expect(screen.queryByText('Search by')).toBeInTheDocument();
+  });
 });
 
 /**