diff --git a/lib/services/address/index.js b/lib/services/address/index.js
index 65942da9..23e39051 100644
--- a/lib/services/address/index.js
+++ b/lib/services/address/index.js
@@ -890,7 +890,7 @@ AddressService.prototype._streamAddressSummary = function(address, options, stre
 
     streamer(err, tx);
 
-    if(err || options.flag_stop){
+    if((err || options.flag_stop) && queue.idle()){
       q.kill();
 
       return callback();