diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/JoinConstraint.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/JoinConstraint.jsx
index ef98229fa4..1b91942590 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/JoinConstraint.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/JoinConstraint.jsx
@@ -486,7 +486,7 @@ const JoinOn = ({
           emptyError={
             <div className="dd-select-alert-error m-2 d-flex align-items-center">
               <Information />
-              No table selected
+              No data found
             </div>
           }
           value={leftFieldOptions.find((opt) => opt.value === leftFieldColumn)}
@@ -529,7 +529,7 @@ const JoinOn = ({
             emptyError={
               <div className="dd-select-alert-error m-2 d-flex align-items-center">
                 <Information />
-                {rightFieldTable ? 'No columns of the same data type' : 'No table selected'}
+                {rightFieldTable ? 'No columns of the same data type' : 'No data found'}
               </div>
             }
             darkMode={darkMode}
diff --git a/frontend/src/TooljetDatabase/Forms/ColumnForm.jsx b/frontend/src/TooljetDatabase/Forms/ColumnForm.jsx
index fd6893867c..5cf7b7bd0f 100644
--- a/frontend/src/TooljetDatabase/Forms/ColumnForm.jsx
+++ b/frontend/src/TooljetDatabase/Forms/ColumnForm.jsx
@@ -299,7 +299,7 @@ const ColumnForm = ({
                   emptyError={
                     <div className="dd-select-alert-error m-2 d-flex align-items-center">
                       <Information />
-                      No data available
+                      No data found
                     </div>
                   }
                   loader={
diff --git a/frontend/src/TooljetDatabase/Forms/EditColumnForm.jsx b/frontend/src/TooljetDatabase/Forms/EditColumnForm.jsx
index 8844699294..5593471d46 100644
--- a/frontend/src/TooljetDatabase/Forms/EditColumnForm.jsx
+++ b/frontend/src/TooljetDatabase/Forms/EditColumnForm.jsx
@@ -538,7 +538,7 @@ const ColumnForm = ({
                     emptyError={
                       <div className="dd-select-alert-error m-2 d-flex align-items-center">
                         <Information />
-                        No data available
+                        No data found
                       </div>
                     }
                     loader={
diff --git a/frontend/src/TooljetDatabase/Forms/EditRowForm.jsx b/frontend/src/TooljetDatabase/Forms/EditRowForm.jsx
index 1a5e3bd1b1..092961612d 100644
--- a/frontend/src/TooljetDatabase/Forms/EditRowForm.jsx
+++ b/frontend/src/TooljetDatabase/Forms/EditRowForm.jsx
@@ -293,7 +293,7 @@ const EditRowForm = ({
                 emptyError={
                   <div className="dd-select-alert-error m-2 d-flex align-items-center">
                     <Information />
-                    No data available
+                    No data found
                   </div>
                 }
                 loader={
diff --git a/frontend/src/TooljetDatabase/Forms/RowForm.jsx b/frontend/src/TooljetDatabase/Forms/RowForm.jsx
index 0b76d2b47a..9ba192c6e1 100644
--- a/frontend/src/TooljetDatabase/Forms/RowForm.jsx
+++ b/frontend/src/TooljetDatabase/Forms/RowForm.jsx
@@ -303,7 +303,7 @@ const RowForm = ({
                 emptyError={
                   <div className="dd-select-alert-error m-2 d-flex align-items-center">
                     <Information />
-                    No data available
+                    No data found
                   </div>
                 }
                 loader={
diff --git a/frontend/src/TooljetDatabase/Forms/TableDetailsDropdown.jsx b/frontend/src/TooljetDatabase/Forms/TableDetailsDropdown.jsx
index 0b99eff4f5..944e1bf2e3 100644
--- a/frontend/src/TooljetDatabase/Forms/TableDetailsDropdown.jsx
+++ b/frontend/src/TooljetDatabase/Forms/TableDetailsDropdown.jsx
@@ -54,7 +54,7 @@ function TableDetailsDropdown({
               emptyError={
                 <div className="dd-select-alert-error m-2 d-flex align-items-center">
                   <Information />
-                  No table selected
+                  No data found
                 </div>
               }
               value={source ? tableList[0] : actions ? onUpdate : targetTable}
diff --git a/frontend/src/TooljetDatabase/Forms/TableSchema.jsx b/frontend/src/TooljetDatabase/Forms/TableSchema.jsx
index 4a4b4ee5c4..1b309b0316 100644
--- a/frontend/src/TooljetDatabase/Forms/TableSchema.jsx
+++ b/frontend/src/TooljetDatabase/Forms/TableSchema.jsx
@@ -298,7 +298,7 @@ function TableSchema({
                 emptyError={
                   <div className="dd-select-alert-error m-2 d-flex align-items-center">
                     <Information />
-                    No data available
+                    No data found
                   </div>
                 }
                 loader={