diff --git a/src/queue_manager.cc b/src/queue_manager.cc
index 6ccda5e7..3132d729 100644
--- a/src/queue_manager.cc
+++ b/src/queue_manager.cc
@@ -51,6 +51,8 @@ QueueManager* QueueManager::instance() {
 void QueueManager::CreateInstance(MultiQueueWaiter* querydb_waiter,
                                   MultiQueueWaiter* indexer_waiter,
                                   MultiQueueWaiter* stdout_waiter) {
+  if (instance_)
+    delete instance_;
   instance_ = new QueueManager(querydb_waiter, indexer_waiter, stdout_waiter);
 }