diff --git a/lib/net/pool.js b/lib/net/pool.js
index b7b96461..0396d438 100644
--- a/lib/net/pool.js
+++ b/lib/net/pool.js
@@ -1435,13 +1435,15 @@ Pool.prototype.handleGetBlocks = co(function* handleGetBlocks(peer, packet) {
   while (hash) {
     blocks.push(new InvItem(invTypes.BLOCK, hash));
 
-    if (blocks.length === 500) {
+    if (hash === packet.stop) {
       peer.hashContinue = hash;
       break;
     }
 
-    if (hash === packet.stop)
+    if (blocks.length === 500) {
+      peer.hashContinue = hash;
       break;
+    }
 
     hash = yield this.chain.db.getNextHash(hash);
   }