diff --git a/src/add-ons/disk_systems/bfs/BFSAddOn.cpp b/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
index 32765fc82e..e0ca448e4e 100644
--- a/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
+++ b/src/add-ons/disk_systems/bfs/BFSAddOn.cpp
@@ -289,6 +289,7 @@ BFSPartitionHandle::Repair(bool checkOnly)
 			if (previousPass != result.pass) {
 				printf("Recreating broken index b+trees...\n");
 				previousPass = result.pass;
+				counter = 0;
 			}
 		}
 	}
diff --git a/src/tools/bfs_shell/command_checkfs.cpp b/src/tools/bfs_shell/command_checkfs.cpp
index 3517e09462..35a6648c5b 100644
--- a/src/tools/bfs_shell/command_checkfs.cpp
+++ b/src/tools/bfs_shell/command_checkfs.cpp
@@ -91,6 +91,7 @@ command_checkfs(int argc, const char* const* argv)
 			if (previousPass != result.pass) {
 				fssh_dprintf("Recreating broken index b+trees...\n");
 				previousPass = result.pass;
+				counter = 0;
 			}
 		}
 	}