diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs
index 5207b1327d..36d14f66f7 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.Cached;
+
 						Title = r.title;
 						Type = r.map_type;
 						Author = r.author;