diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs
index 5207b1327d..7e33da92d8 100755
--- a/OpenRA.Game/Map/MapPreview.cs
+++ b/OpenRA.Game/Map/MapPreview.cs
@@ -132,13 +132,19 @@ namespace OpenRA
 					{
 						var r = FieldLoader.Load<RemoteMapData>(yaml);
 
-						// Map is not useable by the current version
-						if (!r.downloading || r.requires_upgrade)
+						// Map download has been disabled server side
+						if (!r.downloading)
 						{
 							Status = MapStatus.Unavailable;
 							return;
 						}
 
+						// Map is not useable by the current version
+						if (r.requires_upgrade)
+							RuleStatus = MapRuleStatus.Invalid;
+						else
+							RuleStatus = MapRuleStatus.Unknown;
+
 						Title = r.title;
 						Type = r.map_type;
 						Author = r.author;
@@ -211,7 +217,11 @@ namespace OpenRA
 						}
 
 						Log.Write("debug", "Downloaded map to '{0}'", mapPath);
-						Game.RunAfterTick(() => UpdateFromMap(new Map(mapPath), MapClassification.User));
+						Game.RunAfterTick(() =>
+						{
+							UpdateFromMap(new Map(mapPath), MapClassification.User);
+							CacheRules();
+						});
 					};
 
 					download = new Download(mapUrl, mapPath, onDownloadProgress, onDownloadComplete);