diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/MapPreviewLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/MapPreviewLogic.cs
index 7476dedf3f..eb98604c6a 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/MapPreviewLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/MapPreviewLogic.cs
@@ -59,9 +59,15 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			{
 				var preview = parent.Get<MapPreviewWidget>("MAP_PREVIEW");
 				preview.Preview = () => getMap().Map;
-				preview.OnMouseDown = mi => onMouseDown(preview, getMap().Map, mi);
-				preview.SpawnOccupants = getSpawnOccupants;
-				preview.DisabledSpawnPoints = getDisabledSpawnPoints;
+				if (onMouseDown != null)
+					preview.OnMouseDown = mi => onMouseDown(preview, getMap().Map, mi);
+
+				if (getSpawnOccupants != null)
+					preview.SpawnOccupants = getSpawnOccupants;
+
+				if (getDisabledSpawnPoints != null)
+					preview.DisabledSpawnPoints = getDisabledSpawnPoints;
+
 				preview.ShowUnoccupiedSpawnpoints = showUnoccupiedSpawnpoints;
 
 				var titleLabel = parent.Get<LabelWithTooltipWidget>("MAP_TITLE");
diff --git a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs
index 22319cce55..e0ebb20101 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs
@@ -172,7 +172,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			{
 				{ "orderManager", null },
 				{ "getMap", (Func<(MapPreview, Session.MapStatus)>)(() => (map, Session.MapStatus.Playable)) },
-				{ "onMouseDown",  (Action<MapPreviewWidget, MapPreview, MouseInput>)((preview, mapPreview, mi) => { }) },
+				{ "onMouseDown", null },
 				{ "getSpawnOccupants", (Func<Dictionary<int, SpawnOccupant>>)(() => spawnOccupants.Update(selectedReplay)) },
 				{ "getDisabledSpawnPoints", (Func<HashSet<int>>)(() => disabledSpawnPoints.Update(selectedReplay)) },
 				{ "showUnoccupiedSpawnpoints", false },