diff --git a/src/main/scala/codechicken/multipart/handler/MultipartMod.scala b/src/main/scala/codechicken/multipart/handler/MultipartMod.scala
index cc05c5b..1165a5c 100644
--- a/src/main/scala/codechicken/multipart/handler/MultipartMod.scala
+++ b/src/main/scala/codechicken/multipart/handler/MultipartMod.scala
@@ -1,11 +1,14 @@
 package codechicken.multipart.handler
 
 import cpw.mods.fml.common.Mod
-import cpw.mods.fml.common.event.FMLPostInitializationEvent
-import cpw.mods.fml.common.event.FMLPreInitializationEvent
-import cpw.mods.fml.common.event.FMLInitializationEvent
+import cpw.mods.fml.common.event.{
+  FMLInitializationEvent,
+  FMLPostInitializationEvent,
+  FMLPreInitializationEvent,
+  FMLServerAboutToStartEvent,
+  FMLServerStoppedEvent
+}
 import cpw.mods.fml.common.Mod.EventHandler
-import cpw.mods.fml.common.event.FMLServerAboutToStartEvent
 import codechicken.multipart.MultiPartRegistry
 import codechicken.multipart.Tags
 
@@ -39,4 +42,9 @@ object MultipartMod {
   def beforeServerStart(event: FMLServerAboutToStartEvent) {
     MultiPartRegistry.beforeServerStart()
   }
+
+  @EventHandler
+  def serverStopped(event: FMLServerStoppedEvent) {
+    MultipartSaveLoad.loadingWorld = null;
+  }
 }