diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
index 593e09e25..02469d6de 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java
@@ -144,7 +144,7 @@ RevCommit next() throws MissingObjectException,
 		} else {
 			g = new PendingGenerator(w, pending, rf, pendingOutputType);
 
-			if (boundary) {
+			if (walker.hasRevSort(RevSort.BOUNDARY)) {
 				// Because the boundary generator may produce uninteresting
 				// commits we cannot allow the pending generator to dispose
 				// of them early.