diff --git a/packages/client/src/api/attachments.js b/packages/client/src/api/attachments.js
index fdc47636c0..71624de6b2 100644
--- a/packages/client/src/api/attachments.js
+++ b/packages/client/src/api/attachments.js
@@ -1,5 +1,4 @@
 import API from "./api"
-import { notificationStore } from "../stores/index.js"
 
 /**
  * Uploads an attachment to the server.
@@ -40,7 +39,7 @@ export const externalUpload = async (datasourceId, bucket, key, data) => {
     json: false,
     external: true,
   })
-  if (res.error) {
+  if (res?.error) {
     throw "Could not upload file to signed URL"
   }
 }
diff --git a/packages/client/src/components/app/forms/S3Upload.svelte b/packages/client/src/components/app/forms/S3Upload.svelte
index 8072b92e59..256c6c41d5 100644
--- a/packages/client/src/components/app/forms/S3Upload.svelte
+++ b/packages/client/src/components/app/forms/S3Upload.svelte
@@ -98,29 +98,34 @@
   bind:fieldApi
   defaultValue={[]}
 >
-  {#if fieldState}
-    <CoreDropzone
-      value={fieldState.value}
-      disabled={loading || fieldState.disabled}
-      error={fieldState.error}
-      on:change={e => {
-        fieldApi.setValue(e.detail)
-      }}
-      {processFiles}
-      {handleFileTooLarge}
-      maximum={1}
-      fileSizeLimit={MaxFileSize}
-    />
-  {/if}
-  {#if loading}
-    <div class="overlay" />
-    <div class="loading">
-      <ProgressCircle />
-    </div>
-  {/if}
+  <div class="content">
+    {#if fieldState}
+      <CoreDropzone
+        value={fieldState.value}
+        disabled={loading || fieldState.disabled}
+        error={fieldState.error}
+        on:change={e => {
+          fieldApi.setValue(e.detail)
+        }}
+        {processFiles}
+        {handleFileTooLarge}
+        maximum={1}
+        fileSizeLimit={MaxFileSize}
+      />
+    {/if}
+    {#if loading}
+      <div class="overlay" />
+      <div class="loading">
+        <ProgressCircle />
+      </div>
+    {/if}
+  </div>
 </Field>
 
 <style>
+  .content {
+    position: relative;
+  }
   .overlay,
   .loading {
     position: absolute;
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 9687ca2280..6085fafec5 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -6,7 +6,6 @@ import {
   authStore,
   stateStore,
   uploadStore,
-  notificationStore,
 } from "stores"
 import { saveRow, deleteRow, executeQuery, triggerAutomation } from "api"
 import { ActionTypes } from "constants"