diff --git a/app/javascript/shared/activestorage/file-upload-error.js b/app/javascript/shared/activestorage/file-upload-error.js
index 360557956..9b8b4285a 100644
--- a/app/javascript/shared/activestorage/file-upload-error.js
+++ b/app/javascript/shared/activestorage/file-upload-error.js
@@ -30,7 +30,7 @@ export default class FileUploadError extends Error {
     See FAILURE_* constants for values.
     */
   get failureReason() {
-    let isNetworkError = this.code != ERROR_CODE_READ;
+    let isNetworkError = this.code && this.code != ERROR_CODE_READ;
 
     if (isNetworkError && this.status != 0) {
       return FAILURE_SERVER;
@@ -51,8 +51,8 @@ export default class FileUploadError extends Error {
 //   (so that Sentry knows they are different kind of errors, from
 //   the line they were created.)
 export function errorFromDirectUploadMessage(message) {
-  let matches = message.match(/ Status: [0-9]{1,3}/);
-  let status = (matches && parseInt(matches[0], 10)) || undefined;
+  let matches = message.match(/ Status: ([0-9]{1,3})/);
+  let status = matches ? parseInt(matches[1], 10) : undefined;
 
   // prettier-ignore
   if (message.includes('Error reading')) {
diff --git a/app/javascript/shared/activestorage/uploader.js b/app/javascript/shared/activestorage/uploader.js
index 1d1dcce8b..2c1c081de 100644
--- a/app/javascript/shared/activestorage/uploader.js
+++ b/app/javascript/shared/activestorage/uploader.js
@@ -30,11 +30,12 @@ export default class Uploader {
 
       if (this.autoAttachUrl) {
         await this._attach(blobSignedId);
+        // On response, the attachment HTML fragment will replace the progress bar.
+      } else {
+        this.progressBar.end();
+        this.progressBar.destroy();
       }
 
-      this.progressBar.end();
-      this.progressBar.destroy();
-
       return blobSignedId;
     } catch (error) {
       this.progressBar.error(error.message);