diff --git a/app/models/foreman_passwordstate/passwordstate_host_facet.rb b/app/models/foreman_passwordstate/passwordstate_host_facet.rb
index 54a6545d8e93ac130a6906231887871e606ea47c..21d01862a154d9506cca09cd454014e665add6ba 100644
--- a/app/models/foreman_passwordstate/passwordstate_host_facet.rb
+++ b/app/models/foreman_passwordstate/passwordstate_host_facet.rb
@@ -20,7 +20,7 @@ module ForemanPasswordstate
 
     # FOREMAN-37043
     def self.inherited_attributes(hostgroup, facet_attributes)
-      facet_attributes.merge(super) { |_, left, right| left || right }
+      (facet_attributes || {}).merge(super) { |_, left, right| left || right }
     end
   end
 end