diff --git a/src/space.c b/src/space.c
index 3e51e9f11178f6ca57e612db3ed9aa4ac8fd0ead..d5ad72dc3ae1e0775df020582e77c168777a1973 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1037,6 +1037,9 @@ void space_rebuild(struct space *s, int repartitioned, int verbose) {
 #ifdef SWIFT_DEBUG_CHECKS
   if (s->e->nodeID == 0 || verbose) message("(re)building space");
   fflush(stdout);
+
+  /* Reset the cell counter */
+  last_cell_id = 1;
 #endif
 
   /* Re-grid if necessary, or just re-set the cell data. */