diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java
index 840bc1437..17de349f9 100644
--- a/src/java/com/threerings/crowd/server/PlaceManager.java
+++ b/src/java/com/threerings/crowd/server/PlaceManager.java
@@ -538,6 +538,9 @@ public class PlaceManager
                 delegate.didShutdown();
             }
         });
+
+        // if shutting down emptied the place and scheduled the shutdowner, clear that out
+        cancelShutdowner();
     }
 
     /**