diff --git a/app/pods/protected/strains/measurements-table-row/component.js b/app/pods/protected/strains/measurements-table-row/component.js
index b818de6..c3e5c89 100644
--- a/app/pods/protected/strains/measurements-table-row/component.js
+++ b/app/pods/protected/strains/measurements-table-row/component.js
@@ -53,7 +53,8 @@ export default Component.extend({
     },
 
     characteristicDidChange: function(value) {
-      this.updateField('characteristic', value);
+      const newCharacteristic = this.get('allCharacteristics').findBy('id', value);
+      this.updateField('characteristic', newCharacteristic);
     },
 
     valueDidChange: function(value) {
diff --git a/app/pods/protected/strains/measurements-table-row/template.hbs b/app/pods/protected/strains/measurements-table-row/template.hbs
index 5bb44f0..0dc03b7 100644
--- a/app/pods/protected/strains/measurements-table-row/template.hbs
+++ b/app/pods/protected/strains/measurements-table-row/template.hbs
@@ -1,13 +1,11 @@
 {{#if isEditing}}
   <td></td>
   <td>
-    {{
-      select-2
-      multiple=false
-      content=allCharacteristics
-      value=characteristic
-      optionLabelPath="characteristicName"
-    }}
+    <select onchange={{action "characteristicDidChange" value="target.value"}}>
+      {{#each allCharacteristics as |characteristicChoice|}}
+        <option value={{characteristicChoice.id}} selected={{equal characteristic.id characteristicChoice.id}}>{{characteristicChoice.characteristicName}}</option>
+      {{/each}}
+    </select>
   </td>
   <td>
     {{one-way-input type="text" class="measurement-value" value=value update=(action "valueDidChange")}}