diff --git a/frontend/src/Album/TrackQuality.js b/frontend/src/Album/TrackQuality.js
index 6193ab197..ca94227a0 100644
--- a/frontend/src/Album/TrackQuality.js
+++ b/frontend/src/Album/TrackQuality.js
@@ -35,6 +35,10 @@ function TrackQuality(props) {
     isCutoffNotMet
   } = props;
 
+  if (!quality) {
+    return null;
+  }
+
   return (
     <Label
       className={className}
diff --git a/frontend/src/Store/Actions/releaseActions.js b/frontend/src/Store/Actions/releaseActions.js
index 11b6628d6..dd114f74a 100644
--- a/frontend/src/Store/Actions/releaseActions.js
+++ b/frontend/src/Store/Actions/releaseActions.js
@@ -260,17 +260,16 @@ export const reducers = createHandleActions({
     const guid = payload.guid;
     const newState = Object.assign({}, state);
     const items = newState.items;
-
-    // Return early if there aren't any items (the user closed the modal)
-    if (!items.length) {
-      return;
-    }
-
     const index = items.findIndex((item) => item.guid === guid);
-    const item = Object.assign({}, items[index], payload);
 
-    newState.items = [...items];
-    newState.items.splice(index, 1, item);
+    // Don't try to update if there isnt a matching item (the user closed the modal)
+
+    if (index >= 0) {
+      const item = Object.assign({}, items[index], payload);
+
+      newState.items = [...items];
+      newState.items.splice(index, 1, item);
+    }
 
     return newState;
   },