diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
index 690458593..b3acf518c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
@@ -371,6 +371,7 @@ public class ObjectWalk extends RevWalk {
 	public void dispose() {
 		super.dispose();
 		pendingObjects = new BlockObjQueue();
+		treeWalk = new CanonicalTreeParser();
 		nextSubtree = null;
 		currentTree = null;
 	}
@@ -379,6 +380,7 @@ public class ObjectWalk extends RevWalk {
 	protected void reset(final int retainFlags) {
 		super.reset(retainFlags);
 		pendingObjects = new BlockObjQueue();
+		treeWalk = new CanonicalTreeParser();
 		nextSubtree = null;
 	}