diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs
index 7e8fece2e4..b34e87d72a 100644
--- a/OpenRA.Game/Graphics/WorldRenderer.cs
+++ b/OpenRA.Game/Graphics/WorldRenderer.cs
@@ -109,9 +109,7 @@ namespace OpenRA.Graphics
 		{
 			RefreshPalette();
 
-			// workaround for #4965
-			// if (world.IsShellmap && !Game.Settings.Game.ShowShellmap)
-			if (world.IsShellmap)
+			if (world.IsShellmap && !Game.Settings.Game.ShowShellmap)
 				return;
 
 			var renderables = GenerateRenderables();
diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs
index 09edb42db5..ef4da31036 100644
--- a/OpenRA.Game/World.cs
+++ b/OpenRA.Game/World.cs
@@ -217,9 +217,7 @@ namespace OpenRA
 
 		public void Tick()
 		{
-			// workaround for #4965
-			// if (!Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap))
-			if (!Paused && !IsShellmap)
+			if (!Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap))
 			{
 				WorldTick++;
 
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs
index 4128db5be0..266515e2b6 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs
@@ -20,15 +20,11 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			: base(widget, world)
 		{
 			var shellmapDecorations = widget.Get("SHELLMAP_DECORATIONS");
-			// workaround for #4965
-			// shellmapDecorations.IsVisible = () => menuType != MenuType.None && Game.Settings.Game.ShowShellmap;
-			shellmapDecorations.IsVisible = () => false;
+			shellmapDecorations.IsVisible = () => menuType != MenuType.None && Game.Settings.Game.ShowShellmap;
 			shellmapDecorations.Get<ImageWidget>("RECBLOCK").IsVisible = () => world.WorldTick / 25 % 2 == 0;
 
 			var shellmapDisabledDecorations = widget.Get("SHELLMAP_DISABLED_DECORATIONS");
-			// workaround for #4965
-			// shellmapDisabledDecorations.IsVisible = () => !Game.Settings.Game.ShowShellmap;
-			shellmapDisabledDecorations.IsVisible = () => true;
+			shellmapDisabledDecorations.IsVisible = () => !Game.Settings.Game.ShowShellmap;
 		}
 	}
 }
diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
index a347a56747..d623577686 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
@@ -117,16 +117,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 
 			BindCheckboxPref(panel, "PIXELDOUBLE_CHECKBOX", ds, "PixelDouble");
 			BindCheckboxPref(panel, "FRAME_LIMIT_CHECKBOX", ds, "CapFramerate");
-			// workaround for #4965
-			// BindCheckboxPref(panel, "SHOW_SHELLMAP", gs, "ShowShellmap");
+			BindCheckboxPref(panel, "SHOW_SHELLMAP", gs, "ShowShellmap");
 			BindCheckboxPref(panel, "ALWAYS_SHOW_STATUS_BARS_CHECKBOX", gs, "AlwaysShowStatusBars");
 			BindCheckboxPref(panel, "TEAM_HEALTH_COLORS_CHECKBOX", gs, "TeamHealthColors");
 
-			// workaround for #4965
-			var shellmapCheckbox = panel.Get<CheckboxWidget>("SHOW_SHELLMAP");
-			shellmapCheckbox.IsDisabled = () =>  true;
-			shellmapCheckbox.IsChecked = () =>  false;
-
 			var languageDropDownButton = panel.Get<DropDownButtonWidget>("LANGUAGE_DROPDOWNBUTTON");
 			languageDropDownButton.OnMouseDown = _ => ShowLanguageDropdown(languageDropDownButton);
 			languageDropDownButton.GetText = () => FieldLoader.Translate(ds.Language);