diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index 7cb702b..26de695 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -340,6 +340,10 @@ module Vmpooler
                 check_ready_vm(vm, pool['name'], pool['ready_ttl'] || 0)
               rescue
               end
+            else
+              $logger.log('d', "[!] [#{pool['name']}] '#{vm}' is not in inventory, removing from 'ready' queue")
+              $redis.srem('vmpooler__ready__' + pool['name'], vm)
+              $redis.del('vmpooler__vm__' + vm)
             end
           end
 
@@ -358,6 +362,10 @@ module Vmpooler
                 check_pending_vm(vm, pool['name'], pool['timeout'])
               rescue
               end
+            else
+              $logger.log('d', "[!] [#{pool['name']}] '#{vm}' not in inventory, removing from 'pending' queue")
+              $redis.srem('vmpooler__pending__' + pool['name'], vm)
+              $redis.del('vmpooler__vm__' + vm)
             end
           end