diff --git a/oc-chef-pedant/spec/running_configs/basic_config_spec.rb b/oc-chef-pedant/spec/running_configs/basic_config_spec.rb
index 99a0aa03f9..5995b96e3a 100644
--- a/oc-chef-pedant/spec/running_configs/basic_config_spec.rb
+++ b/oc-chef-pedant/spec/running_configs/basic_config_spec.rb
@@ -142,8 +142,8 @@
       expect(config['opscode-erchef']['solr_http_max_age'].to_s).not_to eq ''
     end
 
-    it "opscode-erchef/solr_track_total_hits" do
-      expect(config['opscode-erchef']['solr_track_total_hits'].to_s).not_to eq ''
+    it "opscode-erchef/track_total_hits" do
+      expect(config['opscode-erchef']['track_total_hits'].to_s).not_to eq ''
     end
 
     it "opscode-erchef/solr_http_max_connection_duration" do
diff --git a/omnibus/files/server-ctl-cookbooks/infra-server/attributes/default.rb b/omnibus/files/server-ctl-cookbooks/infra-server/attributes/default.rb
index 0f048aec59..dd4b175288 100755
--- a/omnibus/files/server-ctl-cookbooks/infra-server/attributes/default.rb
+++ b/omnibus/files/server-ctl-cookbooks/infra-server/attributes/default.rb
@@ -352,7 +352,7 @@
 default['private_chef']['opscode-erchef']['solr_http_max_count'] = 100
 default['private_chef']['opscode-erchef']['solr_http_cull_interval'] = '{1, min}'
 default['private_chef']['opscode-erchef']['solr_http_max_age'] = '{70, sec}'
-default['private_chef']['opscode-erchef']['solr_track_total_hits'] = false
+default['private_chef']['opscode-erchef']['track_total_hits'] = false
 default['private_chef']['opscode-erchef']['solr_http_max_connection_duration'] = '{70,sec}'
 default['private_chef']['opscode-erchef']['solr_retry_on_conn_closed'] = true
 default['private_chef']['opscode-erchef']['solr_ibrowse_options'] = '[{connect_timeout, 10000}]'
diff --git a/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/oc_erchef.config.erb b/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/oc_erchef.config.erb
index 5e02b8f46b..7243752d01 100755
--- a/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/oc_erchef.config.erb
+++ b/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/oc_erchef.config.erb
@@ -194,7 +194,7 @@
             {timeout, <%= @solr_timeout %>},
             {init_count, <%= @solr_http_init_count %>},
             {max_count, <%= @solr_http_max_count %>},
-            {track_total_hits, <%= @solr_track_total_hits %>},
+            {track_total_hits, <%= track_total_hits -%>},
             {cull_interval, <%= @solr_http_cull_interval %>},
             {max_age, <%= @solr_http_max_age %>},
             {max_connection_duration, <%= @solr_http_max_connection_duration %>},
diff --git a/src/oc_erchef/habitat/config/sys.config b/src/oc_erchef/habitat/config/sys.config
index 84de52273e..ce47422f9a 100644
--- a/src/oc_erchef/habitat/config/sys.config
+++ b/src/oc_erchef/habitat/config/sys.config
@@ -173,7 +173,7 @@
         {search_batch_max_wait, 10},
         {reindex_sleep_min_ms, 500},
         {reindex_sleep_max_ms, 2000},
-        {track_total_hits,false},
+        {track_total_hits, {{track_total_hits}} },
         {reindex_item_retries, 3},
         {solr_elasticsearch_major_version, 5},
         {solr_service, [