diff --git a/app/assets/javascripts/samples/sample_datatable.js.erb b/app/assets/javascripts/samples/sample_datatable.js.erb
index 4a00e6d91..cb2c6fab8 100644
--- a/app/assets/javascripts/samples/sample_datatable.js.erb
+++ b/app/assets/javascripts/samples/sample_datatable.js.erb
@@ -805,7 +805,7 @@ function createSampleTypeSelect(data, selected) {
   $.each(data, function(i, val) {
     var $option = $('<option></option>')
       .attr('value', val.id).text(val.name);
-    if((i + 1) === selected) {
+    if(val.id === selected) {
       $option.attr('selected', true);
     }
     $selectType.append($option);
@@ -834,7 +834,7 @@ function createSampleGroupSelect(data, selected) {
     var $option = $('<option></option>')
       .attr('value', val.id).text(val.name)
       .attr('data-content', $span.prop('outerHTML') + ' ' + val.name);
-    if((i + 1) === selected) {
+    if(val.id === selected) {
       $option.attr('selected', true);
     }
     $selectGroup.append($option);