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 f5660440734..8abfea426a1 100644
--- a/app/assets/javascripts/select-kit/components/multi-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -38,8 +38,7 @@ export default SelectKitComponent.extend({
   _compute() {
     Ember.run.scheduleOnce("afterRender", () => {
       this.willComputeAttributes();
-      let content = this._beforeWillComputeContent(this.get("content"));
-      content = this.willComputeContent(content);
+      let content = this.willComputeContent(this.get("content") || []);
       let values = this._beforeWillComputeValues(this.get("values"));
       content = this.computeContent(content);
       content = this._beforeDidComputeContent(content);
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index a8043eaf376..9e10dfb513c 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -1,4 +1,4 @@
-const { isNone, makeArray } = Ember;
+const { isNone } = Ember;
 import computed from "ember-addons/ember-computed-decorators";
 import UtilsMixin from "select-kit/mixins/utils";
 import DomHelpersMixin from "select-kit/mixins/dom-helpers";
@@ -88,7 +88,6 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
   willComputeAttributes() {},
   didComputeAttributes() {},
 
-  _beforeWillComputeContent(content) { return makeArray(content); },
   willComputeContent(content) { return content; },
   computeContent(content) { return content; },
   _beforeDidComputeContent(content) {
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 eedaa6f162d..0cca45bafbd 100644
--- a/app/assets/javascripts/select-kit/components/single-select.js.es6
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -32,8 +32,7 @@ export default SelectKitComponent.extend({
   _compute() {
     Ember.run.scheduleOnce("afterRender", () => {
       this.willComputeAttributes();
-      let content = this._beforeWillComputeContent(this.get("content"));
-      content = this.willComputeContent(content);
+      let content = this.willComputeContent(this.get("content") || []);
       let value = this._beforeWillComputeValue(this.get("value"));
       content = this.computeContent(content);
       content = this._beforeDidComputeContent(content);