diff --git a/app/models/job_proxy_dispatcher.rb b/app/models/job_proxy_dispatcher.rb
index c4ab958b4ff..0a6b96c629f 100644
--- a/app/models/job_proxy_dispatcher.rb
+++ b/app/models/job_proxy_dispatcher.rb
@@ -202,7 +202,7 @@ def assign_proxy_to_job(proxy, job)
   end
 
   def self.waiting?
-    Job.where(:state => 'waiting_to_start').exists?
+    Job.where(:state => 'waiting_to_start').exists? || InfraConversionJob.where.not(:state => ['finished', 'waiting_to_start']).exists?
   end
 
   def pending_jobs(job_class = VmScan)