app/models/foreman_uuid_boot/uuidboot_host_facet.rb

@@ -5,10 +5,17 @@ module ForemanUuidBoot
     include Facets::Base
 
     def self.populate_fields_from_facts(host, parser, _type, _proxy)
-      facet = host.uuidboot_facet || host.build_uuidboot_facet
-      facet.uuid = parser.facts.dig('dmi', 'product', 'uuid') || parser.facts['uuid']
-      facet.save if facet.uuid && facet.changed?
-      facet.destroy if !facet.uuid && facet.persisted?
+      uuid = parser.facts.dig('dmi', 'product', 'uuid') || parser.facts['uuid']
+
+      if uuid
+        facet = host.uuidboot_facet || host.build_uuidboot_facet
+        facet.uuid = uuid
+        facet.save if facet.changed? || !facet.persisted?
+        facet
+      else
+        host.uuidboot_facet&.destroy
+        nil
+      end
     end
   end
 end

lib/foreman_uuid_boot/version.rb

 # frozen_string_literal: true
 
 module ForemanUuidBoot
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end