diff --git a/src/pages/KnowledgeBase.vue b/src/pages/KnowledgeBase.vue
index 93f527a..3b96974 100644
--- a/src/pages/KnowledgeBase.vue
+++ b/src/pages/KnowledgeBase.vue
@@ -1,5 +1,6 @@
 <template>
-  <section v-if="knowledgeBaseRef" class="max-sm:tw-mx-4 sm:tw-mx-10 tw-space-y-4 tw-my-5">
+  <q-linear-progress v-if="!knowledgeStore.isLoaded" class="tw-mt-20" indeterminate />
+  <section v-else-if="knowledgeBaseRef" class="max-sm:tw-mx-4 sm:tw-mx-10 tw-space-y-4 tw-my-5">
     <q-btn class="tw-w-10 tw-h-10" to="/knowledge-base" unelevated>
       <ltai-icon name="svguse:icons.svg#arrow-left" />
     </q-btn>
@@ -161,6 +162,7 @@
         </q-card-section>
       </ltai-dialog>
     </div>
+    <q-linear-progress v-if="uploadInProgress" indeterminate />
   </section>
 </template>
 <script lang="ts" setup>
@@ -197,6 +199,7 @@ const showRenameKnowledgeBase = ref(false);
 const showDeleteKnowledgeBaseConfirmation = ref(false);
 const showRenameDocument = ref(false);
 const showDeleteDocumentConfirmation = ref(false);
+const uploadInProgress = ref(false);
 
 watch(
   () => route.params.id as string,
@@ -256,6 +259,8 @@ const uploadDocuments = async (event: any) => {
   const encryptionKey = Buffer.from(knowledgeBaseIdentifierRef.value.encryption.key);
   const encryptionIv = Buffer.from(knowledgeBaseIdentifierRef.value.encryption.iv);
 
+  uploadInProgress.value = true;
+
   await Promise.all(
     Array.from(target.files as FileList).map(async (file) => {
       try {
@@ -275,6 +280,7 @@ const uploadDocuments = async (event: any) => {
       }
     }),
   );
+  uploadInProgress.value = false;
 
   knowledgeBaseRef.value.documents = knowledgeBaseRef.value.documents.concat(documents);
 
diff --git a/src/pages/KnowledgeBasesList.vue b/src/pages/KnowledgeBasesList.vue
index 2d228a7..17d6a37 100644
--- a/src/pages/KnowledgeBasesList.vue
+++ b/src/pages/KnowledgeBasesList.vue
@@ -16,8 +16,9 @@
       <knowledge-base-creation-dialog v-model="createKnowledgeDialog" @create="createKnowledgeBase" />
     </div>
 
+    <q-linear-progress v-if="!knowledgeStore.isLoaded" indeterminate />
     <empty-state
-      v-if="knowledgeStore.knowledgeBases.length === 0"
+      v-else-if="knowledgeStore.knowledgeBases.length === 0"
       description="Create a Knowledge Base to get started"
       image-alt="No knowledge base"
       image-link="/assets/empty-states/knowledge-base.png"