diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6
index 279656145a0..9358d75e619 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -193,7 +193,12 @@ export default SelectKitComponent.extend({
   @computed("computedValues.[]", "computedContent.[]")
   selectedComputedContents(computedValues, computedContent) {
     const selected = [];
-    computedValues.forEach(v => selected.push(computedContent.findBy("value", v)) );
+
+    computedValues.forEach(v => {
+      const value = computedContent.findBy("value", v);
+      if (value) selected.push(value);
+    });
+
     return selected;
   },