diff --git a/lib/services/address/index.js b/lib/services/address/index.js
index 45962983..8028da06 100644
--- a/lib/services/address/index.js
+++ b/lib/services/address/index.js
@@ -304,15 +304,13 @@ AddressService.prototype.getAddressSummary = function(address, options, streamer
     txApperances: 0,
   };
 
-  self._aggregateAddressSummaryResult(tx, address, result);
-
   self.getAddressHistory(address, options, function(err, tx) {
 
     if(err)
         return log.error(err);
 
     if(tx)
-      self._aggregateAddressSummaryResult(tx, address, result);
+      self._aggregateAddressSummaryResult(tx, address, result, options);
     
     streamer(null, tx);
 
@@ -717,9 +715,7 @@ AddressService.prototype._streamAddressSummary = function(address, options, stre
 
   //declare the queue to process tx data
 
-  var q = async.queue(function(task, cb) {
-
-    let {id, options} = task;
+  var q = async.queue(function(id, cb) {
 
     if (id.height === 0xffffffff) {
 
@@ -790,6 +786,7 @@ AddressService.prototype._streamAddressSummary = function(address, options, stre
       });
 
       txIdTransformStream.on('end', function() {
+        q.drain = next;
         q.resume();
       });
 
@@ -802,9 +799,7 @@ AddressService.prototype._streamAddressSummary = function(address, options, stre
 
       var txidStream = self._getTxidStream(address, options);
       txidStream.pipe(txIdTransformStream);
-
-      q.drain(next);
-
+      
     }
   ], callback);