diff --git a/apps/smart-forms-app/src/features/prepopulate/hooks/usePopulate.tsx b/apps/smart-forms-app/src/features/prepopulate/hooks/usePopulate.tsx
index d4cf0118b..4e1391a69 100644
--- a/apps/smart-forms-app/src/features/prepopulate/hooks/usePopulate.tsx
+++ b/apps/smart-forms-app/src/features/prepopulate/hooks/usePopulate.tsx
@@ -80,6 +80,7 @@ function usePopulate(spinner: RendererSpinner, onStopSpinner: () => void): void
   }
 
   setIsPopulated(true);
+
   populateQuestionnaire({
     questionnaire: sourceQuestionnaire,
     fetchResourceCallback: fetchResourceCallback,
@@ -95,7 +96,8 @@ function usePopulate(spinner: RendererSpinner, onStopSpinner: () => void): void
     fetchTerminologyCallback: fetchTerminologyCallback,
     fetchTerminologyRequestConfig: {
       terminologyServerUrl: defaultTerminologyServerUrl
-    }
+    },
+    timeoutMs: 30000
   })
     .then(async (populateRes) => {
       if (!populateRes) {
diff --git a/apps/smart-forms-app/src/features/prepopulate/test/usePopulate.test.tsx b/apps/smart-forms-app/src/features/prepopulate/test/usePopulate.test.tsx
index c3f89a0fe..80322611e 100644
--- a/apps/smart-forms-app/src/features/prepopulate/test/usePopulate.test.tsx
+++ b/apps/smart-forms-app/src/features/prepopulate/test/usePopulate.test.tsx
@@ -317,7 +317,8 @@ describe('usePopulate', () => {
         fetchTerminologyCallback: expect.any(Function),
         fetchTerminologyRequestConfig: {
           terminologyServerUrl: 'https://test-terminology-server.com'
-        }
+        },
+        timeoutMs: 30000
       });
     });