diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
index ffad4c6b5..e5e04d014 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
@@ -819,10 +819,10 @@ public class UploadPack {
 	private ObjectId processHaveLines(List<ObjectId> peerHas, ObjectId last)
 			throws IOException {
 		preUploadHook.onBeginNegotiateRound(this, wantIds, peerHas.size());
-		if (peerHas.isEmpty())
-			return last;
 		if (wantAll.isEmpty() && !wantIds.isEmpty())
 			parseWants();
+		if (peerHas.isEmpty())
+			return last;
 
 		sentReady = false;
 		int haveCnt = 0;