diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js.es6
index 5f539a52688..c05c6b7db00 100644
--- a/app/assets/javascripts/select-kit/components/single-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -94,7 +94,6 @@ export default SelectKitComponent.extend({
 
   @computed("computedValue", "computedContent.[]")
   selectedComputedContent(computedValue, computedContent) {
-    if (isNone(computedValue) || isNone(computedContent)) { return null; }
     return computedContent.findBy("value", computedValue);
   },
 
diff --git a/test/javascripts/components/single-select-test.js.es6 b/test/javascripts/components/single-select-test.js.es6
index 1093fea0d00..5dfef9c4fed 100644
--- a/test/javascripts/components/single-select-test.js.es6
+++ b/test/javascripts/components/single-select-test.js.es6
@@ -423,3 +423,20 @@ componentTest('with nameChanges', {
     });
   }
 });
+
+
+componentTest('with null value', {
+  template: '{{single-select content=content}}',
+
+  beforeEach() {
+    this.set("content", [{ name: "robin" }]);
+  },
+
+  test(assert) {
+    expandSelectKit();
+
+    andThen(() => {
+      assert.equal(selectKit().header.name(), "robin");
+    });
+  }
+});