diff --git a/js/search/queue.js b/js/search/queue.js
index 7fb409f4..ab635167 100644
--- a/js/search/queue.js
+++ b/js/search/queue.js
@@ -24,7 +24,9 @@ let makeBoundTimedCollector = function(isIndexing, timeout, callback) {
         clearTimeout(timer);
         timer = null;
         resetQueue();
-        callback(JSON.stringify(queue));
+        if (queue) {
+            callback(JSON.stringify(queue));
+        }
     }
 
     function getQueue(){
diff --git a/js/search/search.js b/js/search/search.js
index 45cefc3f..d394990b 100644
--- a/js/search/search.js
+++ b/js/search/search.js
@@ -169,10 +169,6 @@ class Search {
      * @param message
      */
     realTimeIndexing(message) {
-        if (!message) {
-            log.send(logLevels.ERROR, 'RealTime Indexing: Messages not provided');
-            throw new Error('RealTime Indexing: Messages is required');
-        }
 
         try {
             let msg = JSON.parse(message);