diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte
index e54e44eba..de7ed82d8 100644
--- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte
@@ -142,7 +142,8 @@
                 authKey: $providerData.credentials['authKey'],
                 authKeyId: $providerData.credentials['authKeyId'],
                 teamId: $providerData.credentials['teamId'],
-                bundleId: $providerData.credentials['bundleId']
+                bundleId: $providerData.credentials['bundleId'],
+                sandbox: $providerData.options['sandbox']
             };
             break;
     }
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
index e1fe4b242..6555e751f 100644
--- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
+++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
@@ -26,6 +26,7 @@
     let updated = false;
     let newMemberModal = false;
     let message = '';
+    let ready = false;
 
     const { displayName } = getProviderDisplayNameAndIcon(provider);
 
@@ -61,6 +62,7 @@
                 originalfiles[input.name] = dataTransfer.files;
             }
         }
+        ready = true;
     });
 
     async function update() {
@@ -184,7 +186,8 @@
                         formValues['authKey'],
                         formValues['authKeyId'],
                         formValues['teamId'],
-                        formValues['bundleId']
+                        formValues['bundleId'],
+                        formValues['sandbox']
                     );
                     break;
             }
@@ -228,7 +231,10 @@
             provider settings.
         </p>
         <svelte:fragment slot="aside">
-            <SettingsFormList bind:files {inputs} bind:params={formValues} />
+            <!-- Must wait until ready or else the files input won't be set properly -->
+            {#if ready}
+                <SettingsFormList bind:files {inputs} bind:params={formValues} />
+            {/if}
         </svelte:fragment>
 
         <svelte:fragment slot="actions">