diff --git a/opal-ui/src/components/datasource/DatasourceTables.vue b/opal-ui/src/components/datasource/DatasourceTables.vue
index 6bc8e1406b..e15b53cc51 100644
--- a/opal-ui/src/components/datasource/DatasourceTables.vue
+++ b/opal-ui/src/components/datasource/DatasourceTables.vue
@@ -22,12 +22,11 @@
             size="sm"
           >
             <q-list>
-              <q-item clickable v-close-popup @click="onShowAddTable">
+              <q-item v-if="projectsStore.isReady" clickable v-close-popup @click="onShowAddTable">
                 <q-item-section>
                   <q-item-label>{{ $t('add_table') }}</q-item-label>
                 </q-item-section>
               </q-item>
-
               <q-item clickable v-close-popup @click="onShowAddTables">
                 <q-item-section>
                   <q-item-label>{{ $t('add_tables') }}</q-item-label>
@@ -61,7 +60,7 @@
             </q-list>
           </q-btn-dropdown>
           <q-btn-dropdown
-            v-if="projectsStore.perms.import?.canCreate()"
+            v-if="projectsStore.isReady && projectsStore.perms.import?.canCreate()"
             color="secondary"
             icon="input"
             size="sm"
diff --git a/opal-ui/src/stores/projects.ts b/opal-ui/src/stores/projects.ts
index e9f0861f42..646b4281e9 100644
--- a/opal-ui/src/stores/projects.ts
+++ b/opal-ui/src/stores/projects.ts
@@ -51,6 +51,8 @@ export const useProjectsStore = defineStore('projects', () => {
   const subjects = ref([] as Subject[]);
   const acls = ref([] as Acl[]);
 
+  const isReady = computed(() => summary.value?.datasourceStatus === ProjectDatasourceStatusDto.READY);
+
   function reset() {
     projects.value = [];
     project.value = {} as ProjectDto;
@@ -396,6 +398,7 @@ export const useProjectsStore = defineStore('projects', () => {
     perms,
     subjects,
     acls,
+    isReady,
     initProjects,
     initProject,
     refreshProject,