diff --git a/src/maploader/maploader.cpp b/src/maploader/maploader.cpp
index 8c65bdc98..20582180b 100644
--- a/src/maploader/maploader.cpp
+++ b/src/maploader/maploader.cpp
@@ -2952,7 +2952,6 @@ void MapLoader::LoadLevel(MapData *map, const char *lumpname, int position)
 	ForceNodeBuild = gennodes;
 
 	// [RH] Load in the BEHAVIOR lump
-	Level->Behaviors.UnloadModules();
 	if (map->HasBehavior)
 	{
 		LoadBehavior(map);
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 8656507eb..3321e6cec 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -335,6 +335,7 @@ void FLevelLocals::ClearLevelData()
 	memset(playerstarts, 0, sizeof(playerstarts));
 	Scrolls.Clear();
 	if (automap) automap->Destroy();
+	Behaviors.UnloadModules();
 }
 
 //==========================================================================