diff --git a/src/Components/Modules/ConnectProtocol.cpp b/src/Components/Modules/ConnectProtocol.cpp
index 30eff6d3..6b0a4288 100644
--- a/src/Components/Modules/ConnectProtocol.cpp
+++ b/src/Components/Modules/ConnectProtocol.cpp
@@ -218,7 +218,7 @@ namespace Components
 
 		// Fire protocol handlers
 		// Make sure this happens after the pipe-initialization!
-		if (!Singleton::IsFirstInstance())
+		if (!Singleton::IsFirstInstance() && ConnectProtocol::Used())
 		{
 			IPCPipe::Write("connect", ConnectProtocol::ConnectContainer.ConnectString);
 			ExitProcess(0);
diff --git a/src/Components/Modules/Dedicated.cpp b/src/Components/Modules/Dedicated.cpp
index 285c9c14..a5604622 100644
--- a/src/Components/Modules/Dedicated.cpp
+++ b/src/Components/Modules/Dedicated.cpp
@@ -163,6 +163,9 @@ namespace Components
 
 	Dedicated::Dedicated()
 	{
+		// Map rotation
+		Utils::Hook::Set(0x4152E8, Dedicated::MapRotate);
+
 		if (Dedicated::IsDedicated())
 		{
 			Dvar::Register<bool>("sv_lanOnly", false, Game::dvar_flag::DVAR_FLAG_NONE, "Don't register at the master server");
@@ -198,9 +201,6 @@ namespace Components
 			Utils::Hook::Nop(0x64CF77, 5);          // function detecting video card, causes Direct3DCreate9 to be called
 			Utils::Hook::Nop(0x60BC52, 0x15);       // recommended settings check
 
-			// Map rotation
-			Utils::Hook::Set(0x4152E8, Dedicated::MapRotate);
-
 			// Dedicated frame handler
 			Utils::Hook(0x4B0F81, Dedicated::FrameStub, HOOK_CALL).Install()->Quick();