diff --git a/app/controllers/api/v2/fact_values_controller.rb b/app/controllers/api/v2/fact_values_controller.rb
index bf45e61fc43..dcbab996043 100644
--- a/app/controllers/api/v2/fact_values_controller.rb
+++ b/app/controllers/api/v2/fact_values_controller.rb
@@ -15,8 +15,7 @@ def index
           no_timestamp_facts.
           search_for(*search_options).paginate(paginate_options).
           preload(:fact_name, :host)
-        host_id = params[:host_id]
-        @fact_values = FactValue.build_facts_hash(values, host_id)
+        @fact_values = FactValue.build_facts_hash(values.all)
       end
 
       def setup_search_options
diff --git a/app/models/fact_value.rb b/app/models/fact_value.rb
index cd1335fb036..9be71214023 100644
--- a/app/models/fact_value.rb
+++ b/app/models/fact_value.rb
@@ -92,10 +92,13 @@ def self.count_each(fact, options = {})
     output
   end
 
-  def self.build_facts_hash(values, host_id = nil)
-    hash = values.group_by(&:host_name).transform_values! {|val| val.map {|v| [v.fact_name_name, v.value]}.to_h}
-    if host_id && hash.any?
-      hash.merge! hash.values[0]
+  def self.build_facts_hash(facts)
+    hosts = Host.where(:id => facts.group_by(&:host_id).keys).all
+
+    hash = {}
+    facts.each do |fact|
+      hash[hosts.detect {|h| h.id == fact.host_id}.to_s] ||= {}
+      hash[hosts.detect {|h| h.id == fact.host_id}.to_s].update({fact.name.to_s => fact.value})
     end
     hash
   end
diff --git a/test/controllers/api/v2/fact_values_controller_test.rb b/test/controllers/api/v2/fact_values_controller_test.rb
index 8130e9e18f0..b54c1c9aac8 100644
--- a/test/controllers/api/v2/fact_values_controller_test.rb
+++ b/test/controllers/api/v2/fact_values_controller_test.rb
@@ -24,18 +24,18 @@ def setup
   end
 
   test "should get facts for given host only" do
-    get :index, params: {:host_id => @host.name}
+    get :index, params: { :host_id => @host.name }
     assert_response :success
     fact_values   = ActiveSupport::JSON.decode(@response.body)['results']
-    expected_hash = {@host.name => {"kernelversion" => "2.6.9"}, "kernelversion" => "2.6.9"}
+    expected_hash = FactValue.build_facts_hash(FactValue.where(:host_id => @host.id))
     assert_equal expected_hash, fact_values
   end
 
   test "should get facts for given host id" do
-    get :index, params: {:host_id => @host.id}
+    get :index, params: { :host_id => @host.id }
     assert_response :success
-    fact_values = ActiveSupport::JSON.decode(@response.body)['results']
-    expected_hash = {@host.name => {"kernelversion" => "2.6.9"}, "kernelversion" => "2.6.9"}
+    fact_values   = ActiveSupport::JSON.decode(@response.body)['results']
+    expected_hash = FactValue.build_facts_hash(FactValue.where(:host_id => @host.id))
     assert_equal expected_hash, fact_values
   end
 
@@ -43,7 +43,7 @@ def setup
     setup_user
     @host.update_attribute(:hostgroup, FactoryBot.create(:hostgroup))
     as_user(users(:one)) do
-      get :index, params: {:search => "host.hostgroup = #{@host.hostgroup.name}"}
+      get :index, params: { :search => "host.hostgroup = #{@host.hostgroup.name}" }
     end
     assert_response :success
     fact_values = ActiveSupport::JSON.decode(@response.body)['results']
@@ -79,6 +79,6 @@ def setup
 
   def setup_user
     @request.session[:user] = users(:one).id
-    users(:one).roles = [Role.default, Role.find_by_name('Viewer')]
+    users(:one).roles       = [Role.default, Role.find_by_name('Viewer')]
   end
 end