diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ToolJetDbOperations.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ToolJetDbOperations.jsx
index 65b223839f..df6d4d96c3 100644
--- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ToolJetDbOperations.jsx
+++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/ToolJetDbOperations.jsx
@@ -337,9 +337,20 @@ const ToolJetDbOperations = ({ optionchanged, options, darkMode, isHorizontalLay
     ]
   );
 
+  const triggerTooljetDBStatus = (key) => {
+    if (window.public_config?.ENABLE_TOOLJET_DB == 'false') {
+      toast('Tooljet database is not connected.', {
+        icon: '⚠️',
+      });
+    } else if (key === 'addTJDBTable') {
+      navigate(getPrivateRoute('database'));
+    }
+  };
+
   const fetchTables = async () => {
     const { error, data } = await tooljetDatabaseService.findAll(organizationId);
 
+    triggerTooljetDBStatus();
     if (error) {
       toast.error(error?.message ?? 'Failed to fetch tables');
       return;
@@ -495,7 +506,7 @@ const ToolJetDbOperations = ({ optionchanged, options, darkMode, isHorizontalLay
               onChange={(value) => {
                 value?.value && handleTableNameSelect(value?.value);
               }}
-              onAdd={() => navigate(getPrivateRoute('database'))}
+              onAdd={() => triggerTooljetDBStatus('addTJDBTable')}
               addBtnLabel={'Add new table'}
               value={generateListForDropdown(tables).find((val) => val?.value === selectedTableId)}
             />
diff --git a/server/src/services/import_export_resources.service.ts b/server/src/services/import_export_resources.service.ts
index 6c70c2e382..af643fe9db 100644
--- a/server/src/services/import_export_resources.service.ts
+++ b/server/src/services/import_export_resources.service.ts
@@ -53,8 +53,9 @@ export class ImportExportResourcesService {
     let tableNameMapping = {};
     const imports = { app: [], tooljet_database: [] };
     const importingVersion = importResourcesDto.tooljet_version;
+    const isTJDBEnabled = process.env.ENABLE_TOOLJET_DB === 'true';
 
-    if (importResourcesDto.tooljet_database) {
+    if (isTJDBEnabled && importResourcesDto.tooljet_database) {
       const res = await this.tooljetDbImportExportService.bulkImport(importResourcesDto, importingVersion, cloning);
       tableNameMapping = res.tableNameMapping;
       imports.tooljet_database = res.tooljet_database;