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..943bab3c2 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,
diff --git a/packages/sdc-populate/src/inAppPopulation/utils/populateQuestionnaire.ts b/packages/sdc-populate/src/inAppPopulation/utils/populateQuestionnaire.ts
index 456a7aea1..7cda21e33 100644
--- a/packages/sdc-populate/src/inAppPopulation/utils/populateQuestionnaire.ts
+++ b/packages/sdc-populate/src/inAppPopulation/utils/populateQuestionnaire.ts
@@ -60,7 +60,7 @@ export interface PopulateResult {
  * @property fhirContext - An array of contextual resources within a launch. See https://build.fhir.org/ig/HL7/smart-app-launch/scopes-and-launch-context.html#fhircontext-exp
  * @property fetchTerminologyCallback - A callback function to fetch terminology resources, optional
  * @property fetchTerminologyRequestConfig - Any request configuration to be passed to the fetchTerminologyCallback i.e. headers, auth etc., optional
- * @property timeoutMs - Timeout in milliseconds for the $populate operation, default is 10000ms (10 seconds)
+ * @property timeoutMs - Timeout in milliseconds for the $populate operation, default is 30000ms (30 seconds)
  *
  * @author Sean Fong
  */
@@ -103,7 +103,7 @@ export async function populateQuestionnaire(params: PopulateQuestionnaireParams)
     fhirContext,
     fetchTerminologyCallback,
     fetchTerminologyRequestConfig,
-    timeoutMs = 10000
+    timeoutMs = 30000
   } = params;
 
   const { inputParameters } = await initialiseInputParameters(