diff --git a/src/client/component/fastfiles.cpp b/src/client/component/fastfiles.cpp
index 1003551..ceff893 100644
--- a/src/client/component/fastfiles.cpp
+++ b/src/client/component/fastfiles.cpp
@@ -314,6 +314,37 @@ namespace fastfiles
 
 			db_level_load_add_zone_hook.invoke<void>(load, name, alloc_flags, size_est);
 ;		}
+
+		void db_find_aipaths_stub(game::XAssetType type, const char* name, int allow_create_default)
+		{
+			if (game::DB_XAssetExists(type, name))
+			{
+				game::DB_FindXAssetHeader(type, name, allow_create_default);
+			}
+			else
+			{
+				console::warn("No aipaths found for this map\n");
+			}
+		}
+
+		int format_bsp_name(char* filename, int size, const char* mapname)
+		{
+			std::string name = mapname;
+			auto fmt = "maps/%s.d3dbsp";
+			if (name.starts_with("mp_"))
+			{
+				fmt = "maps/mp/%s.d3dbsp";
+			}
+
+			return game::Com_sprintf(filename, size, fmt, mapname);
+		}
+
+		void get_bsp_filename_stub(char* filename, int size, const char* mapname)
+		{
+			auto base_mapname = mapname;
+			game::Com_IsAddonMap(mapname, &base_mapname);
+			format_bsp_name(filename, size, base_mapname);
+		}
 	}
 
 	std::string get_current_fastfile()
@@ -493,6 +524,22 @@ namespace fastfiles
 				db_level_load_add_zone_hook.create(0x1402705C0, db_level_load_add_zone_stub);
 			}
 
+			if (game::environment::is_mp())
+			{
+				// Allow loading sp maps on mp
+				utils::hook::jump(0x1404ACE70, get_bsp_filename_stub);
+			}
+			else if (game::environment::is_sp())
+			{
+				// TODO: needs S1 singleplayer addresses
+				/*
+				// Allow loading mp maps
+				utils::hook::set(0x40AF90_b, 0xC300B0);
+				// Don't sys_error if aipaths are missing
+				utils::hook::call(0x2F8EE9_b, db_find_aipaths_stub);
+				*/
+			}
+
 			// Allow loading of mixed compressor types
 			utils::hook::nop(SELECT_VALUE(0x1401536D7, 0x140242DF7), 2);
 
diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp
index a722dc0..bf385c2 100644
--- a/src/client/game/symbols.hpp
+++ b/src/client/game/symbols.hpp
@@ -21,6 +21,7 @@ namespace game
 	WEAK symbol<void(errorParm code, const char* message, ...)> Com_Error{0x1402F7570, 0x1403CE480};
 	WEAK symbol<void()> Com_Frame_Try_Block_Function{0x1402F7E10, 0x1403CEF30};
 	WEAK symbol<CodPlayMode()> Com_GetCurrentCoDPlayMode{0, 0x1404C9690};
+	WEAK symbol<bool(const char* mapname, const char** base_mapname)> Com_IsAddonMap{0, 0x1404ACEC0};
 	WEAK symbol<void(float, float, int)> Com_SetSlowMotion{0, 0x1403D19B0};
 	WEAK symbol<void()> Com_Quit_f{0x1402F9390, 0x1403D08C0};
 	WEAK symbol<void(const char* finalmsg)> Com_Shutdown{0x0, 0x1403D1BF0};