diff --git a/Code/Legacy/CrySystem/CrySystem_precompiled.h b/Code/Legacy/CrySystem/CrySystem_precompiled.h
index faa924931f..3ececa6514 100644
--- a/Code/Legacy/CrySystem/CrySystem_precompiled.h
+++ b/Code/Legacy/CrySystem/CrySystem_precompiled.h
@@ -60,13 +60,6 @@
 
 #include <platform.h>
 
-#if defined(WIN32) || defined(WIN64) || defined(APPLE) || defined(LINUX)
-#if defined(DEDICATED_SERVER)
-// enable/disable map load slicing functionality from the build
-#define MAP_LOADING_SLICING
-#endif
-#endif
-
 #ifdef WIN32
 #include <AzCore/PlatformIncl.h>
 #include <tlhelp32.h>
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
index d2a307ecaf..59d764f297 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
@@ -239,15 +239,16 @@ void UiCanvasAssetRefComponent::Activate()
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 void UiCanvasAssetRefComponent::Deactivate()
 {
-#if !defined(DEDICATED_SERVER)
-    if (m_canvasEntityId.IsValid())
+    if (!gEnv->IsDedicated())
     {
-        gEnv->pLyShine->ReleaseCanvasDeferred(m_canvasEntityId);
-        m_canvasEntityId.SetInvalid();
-    }
+        if (m_canvasEntityId.IsValid())
+        {
+            gEnv->pLyShine->ReleaseCanvasDeferred(m_canvasEntityId);
+            m_canvasEntityId.SetInvalid();
+        }
 
-    UiCanvasAssetRefBus::Handler::BusDisconnect();
-    UiCanvasRefBus::Handler::BusDisconnect();
-    UiCanvasManagerNotificationBus::Handler::BusDisconnect();
-#endif
+        UiCanvasAssetRefBus::Handler::BusDisconnect();
+        UiCanvasRefBus::Handler::BusDisconnect();
+        UiCanvasManagerNotificationBus::Handler::BusDisconnect();
+    }
 }