diff --git a/src/common/API/storageAPI.tsx b/src/common/API/storageAPI.tsx
index eb868b25..3a085b3f 100644
--- a/src/common/API/storageAPI.tsx
+++ b/src/common/API/storageAPI.tsx
@@ -12,6 +12,7 @@ const fetchCsrfToken = async (documentStorage: DocumentStorage): Promise<string>
       method: "get",
       url: url,
       withCredentials: true,
+      headers: getHeaders(),
     });
 
     const csrfToken = response.data.csrfToken;
@@ -25,19 +26,18 @@ const fetchCsrfToken = async (documentStorage: DocumentStorage): Promise<string>
   }
 };
 
-const getHeaders = (documentStorage: DocumentStorage, csrfToken?: string): AxiosHeaders => {
+const getHeaders = (csrfToken?: string): AxiosHeaders => {
   const headers = new AxiosHeaders({
     "Content-Type": "application/json",
   });
 
   const xApiKey = "x-api-key";
 
-  if (documentStorage.apiKey) {
-    const apiKey = process.env.REACT_APP_API_KEY_DOCUMENT_STORAGE
-      ? process.env.REACT_APP_API_KEY_DOCUMENT_STORAGE
-      : documentStorage.apiKey;
-    headers.set(xApiKey, apiKey);
-  }
+  const apiKey = process.env.REACT_APP_API_KEY_DOCUMENT_STORAGE;
+
+  if (!apiKey) throw new Error("API key not found");
+
+  headers.set(xApiKey, apiKey);
 
   if (csrfToken) {
     headers.set("X-CSRF-Token", csrfToken); // Set CSRF token if passed
@@ -52,7 +52,7 @@ export const getQueueNumber = async (documentStorage: DocumentStorage): Promise<
   return axios({
     method: "get",
     url: url,
-    headers: getHeaders(documentStorage),
+    headers: getHeaders(),
   });
 };
 
@@ -69,7 +69,7 @@ export const uploadToStorage = async (
   return axios({
     method: "post",
     url: uri,
-    headers: getHeaders(documentStorage, csrfToken), // Add CSRF token to headers
+    headers: getHeaders(csrfToken), // Add CSRF token to headers
     data: {
       document: doc.wrappedDocument,
     },