diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs
index 36d14f66f7..7e33da92d8 100755
--- a/OpenRA.Game/Map/MapPreview.cs
+++ b/OpenRA.Game/Map/MapPreview.cs
@@ -143,7 +143,7 @@ namespace OpenRA
 						if (r.requires_upgrade)
 							RuleStatus = MapRuleStatus.Invalid;
 						else
-							RuleStatus = MapRuleStatus.Cached;
+							RuleStatus = MapRuleStatus.Unknown;
 
 						Title = r.title;
 						Type = r.map_type;
@@ -217,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);