diff --git a/app/models/infra_conversion_job.rb b/app/models/infra_conversion_job.rb
index 8b80e1b256e..1323091c8a2 100644
--- a/app/models/infra_conversion_job.rb
+++ b/app/models/infra_conversion_job.rb
@@ -247,7 +247,8 @@ def queue_signal(*args, deliver_on: nil)
       :zone        => zone,
       :task_id     => guid,
       :args        => args,
-      :deliver_on  => deliver_on
+      :deliver_on  => deliver_on,
+      :server_guid => MiqServer.my_server.guid
     )
   end
 
diff --git a/spec/models/infra_conversion_job_spec.rb b/spec/models/infra_conversion_job_spec.rb
index 28fbc1510b0..c088515709d 100644
--- a/spec/models/infra_conversion_job_spec.rb
+++ b/spec/models/infra_conversion_job_spec.rb
@@ -3,6 +3,7 @@
   let(:user_admin)            { FactoryBot.create(:user_admin) }
   let(:group)                 { FactoryBot.create(:miq_group) }
   let(:zone)                  { FactoryBot.create(:zone) }
+  let(:server)                { FactoryBot.create(:miq_server) }
 
   let(:ems_vmware)            { FactoryBot.create(:ems_vmware, :zone => zone) }
   let(:ems_cluster_vmware)    { FactoryBot.create(:ems_cluster, :ext_management_system => ems_vmware) }
@@ -74,6 +75,7 @@
 
   before do
     allow(MiqServer).to receive(:my_zone).and_return(zone.name)
+    allow(MiqServer).to receive(:my_server).and_return(server)
     allow(ServiceTemplateProvisionRequest).to receive(:destination)
   end