diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java
index c4b01949d..9534053bf 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java
@@ -121,7 +121,7 @@ void partitionTasks() {
 			ArrayList<WeightedPath> topPaths = computeTopPaths();
 			Iterator<WeightedPath> topPathItr = topPaths.iterator();
 			int nextTop = 0;
-			long weightPerThread = totalWeight / threads;
+			long weightPerThread = Math.max(totalWeight / threads, 1);
 			for (int i = beginIndex; i < endIndex;) {
 				DeltaTask task = new DeltaTask(this);
 				long w = 0;