diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/RestoreEntity.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/RestoreEntity.spec.js
index 0f4e0508555..998ae012c7b 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/RestoreEntity.spec.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/RestoreEntity.spec.js
@@ -117,7 +117,7 @@ describe('Restore entity functionality should work properly', () => {
 
     interceptURL(
       'GET',
-      '/api/v1/search/query?q=*&index=table_search_index&from=0&size=10&deleted=true&sort_field=name.keyword&sort_order=asc',
+      '/api/v1/tables?databaseSchema=sample_data.ecommerce_db.shopify&include=deleted',
       'queryDeletedTables'
     );
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx
index 5142b4469fc..3e43e233726 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx
@@ -45,10 +45,11 @@ import {
 import TabsLabel from 'components/TabsLabel/TabsLabel.component';
 import { ERROR_PLACEHOLDER_TYPE } from 'enums/common.enum';
 import { compare, Operation } from 'fast-json-patch';
+import { Include } from 'generated/type/include';
 import { TagLabel } from 'generated/type/tagLabel';
-import { isEmpty, isUndefined, startCase, toNumber } from 'lodash';
+import { isEmpty, isString, isUndefined, startCase } from 'lodash';
 import { observer } from 'mobx-react';
-import { EntityTags, ExtraInfo } from 'Models';
+import { EntityTags, ExtraInfo, PagingResponse } from 'Models';
 import React, {
   FunctionComponent,
   useCallback,
@@ -65,7 +66,7 @@ import {
   restoreDatabaseSchema,
 } from 'rest/databaseAPI';
 import { getFeedCount, postThread } from 'rest/feedsAPI';
-import { searchQuery } from 'rest/searchAPI';
+import { getTableList, TableListParams } from 'rest/tableAPI';
 import { default as appState } from '../../AppState';
 import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants';
 import {
@@ -79,17 +80,12 @@ import {
 import { EntityField } from '../../constants/Feeds.constants';
 import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants';
 import { EntityTabs, EntityType } from '../../enums/entity.enum';
-import { SearchIndex } from '../../enums/search.enum';
 import { ServiceCategory } from '../../enums/service.enum';
 import { OwnerType } from '../../enums/user.enum';
 import { CreateThread } from '../../generated/api/feed/createThread';
 import { DatabaseSchema } from '../../generated/entity/data/databaseSchema';
 import { Table } from '../../generated/entity/data/table';
 import { EntityFieldThreadCount } from '../../interface/feed.interface';
-import {
-  getQueryStringForSchemaTables,
-  getTablesFromSearchResponse,
-} from '../../utils/DatabaseSchemaDetailsUtils';
 import { getEntityFeedLink, getEntityName } from '../../utils/EntityUtils';
 import { getEntityFieldThreadCounts } from '../../utils/FeedUtils';
 import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils';
@@ -116,7 +112,10 @@ const DatabaseSchemaPage: FunctionComponent = () => {
     useParams<{ databaseSchemaFQN: string; tab: EntityTabs }>();
   const [isLoading, setIsLoading] = useState(true);
   const [databaseSchema, setDatabaseSchema] = useState<DatabaseSchema>();
-  const [tableData, setTableData] = useState<Array<Table>>([]);
+  const [tableData, setTableData] = useState<PagingResponse<Table[]>>({
+    data: [],
+    paging: { total: 0 },
+  });
   const [tableDataLoading, setTableDataLoading] = useState<boolean>(true);
 
   const [databaseSchemaName, setDatabaseSchemaName] = useState<string>(
@@ -127,8 +126,6 @@ const DatabaseSchemaPage: FunctionComponent = () => {
   const [isEdit, setIsEdit] = useState(false);
   const [description, setDescription] = useState('');
 
-  const [tableInstanceCount, setTableInstanceCount] = useState<number>(0);
-
   const [error, setError] = useState('');
 
   const [feedCount, setFeedCount] = useState<number>(0);
@@ -175,7 +172,7 @@ const DatabaseSchemaPage: FunctionComponent = () => {
     {
       label: (
         <TabsLabel
-          count={tableInstanceCount}
+          count={tableData.paging.total}
           id={EntityTabs.TABLE}
           isActive={activeTab === EntityTabs.TABLE}
           name={t('label.table-plural')}
@@ -313,28 +310,15 @@ const DatabaseSchemaPage: FunctionComponent = () => {
       });
   };
 
-  const getSchemaTables = async (
-    pageNumber: number,
-    databaseSchema: DatabaseSchema
-  ) => {
+  const getSchemaTables = async (params?: TableListParams) => {
     setTableDataLoading(true);
     try {
-      setCurrentTablesPage(pageNumber);
-      const res = await searchQuery({
-        query: getQueryStringForSchemaTables(
-          databaseSchema.service,
-          databaseSchema.database,
-          databaseSchema
-        ),
-        pageNumber,
-        sortField: 'name.keyword',
-        sortOrder: 'asc',
-        pageSize: PAGE_SIZE,
-        searchIndex: SearchIndex.TABLE,
-        includeDeleted: showDeletedTables,
+      const res = await getTableList({
+        ...params,
+        databaseSchema: databaseSchemaFQN,
+        include: showDeletedTables ? Include.Deleted : Include.NonDeleted,
       });
-      setTableData(getTablesFromSearchResponse(res));
-      setTableInstanceCount(res.hits.total.value);
+      setTableData(res);
     } catch (err) {
       showErrorToast(err as AxiosError);
     } finally {
@@ -342,10 +326,15 @@ const DatabaseSchemaPage: FunctionComponent = () => {
     }
   };
 
-  const tablePaginationHandler = (pageNumber: string | number) => {
-    if (!isUndefined(databaseSchema)) {
-      getSchemaTables(toNumber(pageNumber), databaseSchema);
+  const tablePaginationHandler = (
+    cursorValue: string | number,
+    activePage?: number
+  ) => {
+    if (isString(cursorValue)) {
+      const { paging } = tableData;
+      getSchemaTables({ [cursorValue]: paging[cursorValue] });
     }
+    setCurrentTablesPage(activePage ?? INITIAL_PAGING_VALUE);
   };
 
   const onCancel = () => {
@@ -532,7 +521,7 @@ const DatabaseSchemaPage: FunctionComponent = () => {
             bordered
             columns={tableColumn}
             data-testid="databaseSchema-tables"
-            dataSource={tableData}
+            dataSource={tableData.data}
             locale={{
               emptyText: <FilterTablePlaceHolder />,
             }}
@@ -542,16 +531,13 @@ const DatabaseSchemaPage: FunctionComponent = () => {
           />
         )}
 
-        {tableInstanceCount > PAGE_SIZE && tableData.length > 0 && (
+        {tableData.paging.total > PAGE_SIZE && tableData.data.length > 0 && (
           <NextPrevious
-            isNumberBased
             currentPage={currentTablesPage}
             pageSize={PAGE_SIZE}
-            paging={{
-              total: tableInstanceCount,
-            }}
+            paging={tableData.paging}
             pagingHandler={tablePaginationHandler}
-            totalCount={tableInstanceCount}
+            totalCount={tableData.paging.total}
           />
         )}
       </Col>
@@ -589,8 +575,10 @@ const DatabaseSchemaPage: FunctionComponent = () => {
   }, [databaseSchemaPermission, databaseSchemaFQN]);
 
   useEffect(() => {
-    tablePaginationHandler(INITIAL_PAGING_VALUE);
-  }, [showDeletedTables, databaseSchema]);
+    if (databaseSchemaFQN) {
+      getSchemaTables();
+    }
+  }, [showDeletedTables, databaseSchemaFQN]);
 
   useEffect(() => {
     fetchDatabaseSchemaPermission();
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
index b6194c5b800..3a19475e3ab 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
@@ -570,7 +570,7 @@ const DatabaseDetails: FunctionComponent = () => {
         key: EntityTabs.SCHEMA,
         children: (
           <Row gutter={[0, 16]} wrap={false}>
-            <Col className="p-t-sm m-l-lg" flex="auto">
+            <Col className="p-t-sm p-r-sm m-l-lg" flex="auto">
               <div className="d-flex flex-col gap-4">
                 <DescriptionV1
                   description={description}
diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/tableAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/tableAPI.ts
index 1e2d4ed388f..ddd19453bf7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/rest/tableAPI.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/rest/tableAPI.ts
@@ -13,6 +13,7 @@
 
 import { AxiosResponse } from 'axios';
 import { Operation } from 'fast-json-patch';
+import { Include } from 'generated/type/include';
 import { PagingResponse, RestoreRequestType } from 'Models';
 import { SystemProfile } from '../generated/api/data/createTableProfile';
 import {
@@ -27,6 +28,17 @@ import { Paging } from '../generated/type/paging';
 import { getURLWithQueryFields } from '../utils/APIUtils';
 import APIClient from './index';
 
+export type TableListParams = {
+  fields?: string;
+  database?: string;
+  databaseSchema?: string;
+  before?: string;
+  after?: string;
+  include?: Include;
+  limit?: number;
+  includeEmptyTestSuite?: boolean;
+};
+
 export const getTableDetails = async (
   id: string,
   arrQueryFields: string | string[]
@@ -226,3 +238,11 @@ export const getLatestTableProfileByFqn = async (fqn: string) => {
 
   return response.data;
 };
+
+export const getTableList = async (params?: TableListParams) => {
+  const response = await APIClient.get<PagingResponse<Table[]>>('/tables', {
+    params,
+  });
+
+  return response.data;
+};