diff --git a/lib/services/address/index.js b/lib/services/address/index.js
index 88c627a4..f58ccb6f 100644
--- a/lib/services/address/index.js
+++ b/lib/services/address/index.js
@@ -219,7 +219,7 @@ AddressService.prototype.getAddressHistory = function(addresses, options, stream
           results.items.unshift(tx); //using unshift, so that recent tx (low) are at front
         
         if(results.items.length > MAX_TX_QUERY_LIMIT) { //remove items from array when overflown
-          results.items.sort((a, b) => b.__height - a.__height || a.txid().localeCompare(b.txid()));
+          results.items.sort((a, b) => b.__height - a.__height || b.txid().localeCompare(a.txid()));
           let del_count = options.old_support ? results.items.length : results.items.length - MAX_TX_QUERY_LIMIT;
           let start_index = options.old_support ? MAX_TX_QUERY_LIMIT : 0;
           results.items.splice(start_index, del_count);
@@ -238,7 +238,7 @@ AddressService.prototype.getAddressHistory = function(addresses, options, stream
     }
 
     //sort items in desc block-height, then asc txid (if same height)
-    results.items.sort((a, b) => b.__height - a.__height || a.txid().localeCompare(b.txid()));
+    results.items.sort((a, b) => b.__height - a.__height || b.txid().localeCompare(a.txid()));
     results.totalCount = parseInt(results.totalCount.toFixed());
 
     //Quick support for `from` and `to` options (DEPRECATED! Not recommeded to use)
@@ -991,7 +991,11 @@ AddressService.prototype._streamAddressSummary = function(address, options, stre
     //wait for queue to complete
     function(next) {
 
-      q.drain = () => next();
+      if(!q.started) //No tx in query
+        return next();
+
+      else
+        q.drain = () => next();
 
     }