diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
index 625ec343f..06eb42cbb 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
@@ -437,11 +437,16 @@ public class LockFile {
 		}
 
 		saveStatInformation();
-		if (lck.renameTo(ref))
+		if (lck.renameTo(ref)) {
+			haveLck = false;
 			return true;
-		if (!ref.exists() || deleteRef())
-			if (renameLock())
+		}
+		if (!ref.exists() || deleteRef()) {
+			if (renameLock()) {
+				haveLck = false;
 				return true;
+			}
+		}
 		unlock();
 		return false;
 	}