diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
index 06da0c807d..7488b097ac 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -464,6 +464,10 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             // I'm not sure that _properties contains all properties including those without a value,
             // neither that GetProperty will return a property without a value vs. null... @zpqrtbnk
 
+            // List of properties that will appear in the XML and do not match
+            // anything in the ContentType, so they must be ignored.
+            private static readonly string[] IgnoredKeys = { "version", "isDoc", "key" };
+
 			public DictionaryPublishedContent(
 				IDictionary<string, string> valueDictionary, 
 				Func<DictionaryPublishedContent, IPublishedContent> getParent,
@@ -509,47 +513,36 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 			    _contentType = PublishedContentType.Get(PublishedItemType.Media, _documentTypeAlias);
 				_properties = new Collection<IPublishedContentProperty>();
 
+                //handle content type properties
+                //make sure we create them even if there's no value
+			    foreach (var propertyType in _contentType.PropertyTypes)
+			    {
+			        var alias = propertyType.PropertyTypeAlias;
+                    _keysAdded.Add(alias);
+                    string value;
+                    const bool isPreviewing = false; // false :: never preview a media
+                    var property = valueDictionary.TryGetValue(alias, out value) == false
+                        ? new XmlPublishedProperty(propertyType, isPreviewing) 
+                        : new XmlPublishedProperty(propertyType, isPreviewing, value);
+                    _properties.Add(property);
+			    }
+
 				//loop through remaining values that haven't been applied
-				foreach (var i in valueDictionary.Where(x => !_keysAdded.Contains(x.Key)))
+				foreach (var i in valueDictionary.Where(x =>
+                    _keysAdded.Contains(x.Key) == false // not already processed
+                    && IgnoredKeys.Contains(x.Key) == false)) // not ignorable
 				{
-				    IPublishedContentProperty property;
-
-                    // must ignore that one
-				    if (i.Key == "version" || i.Key == "isDoc") continue;
-
                     if (i.Key.InvariantStartsWith("__"))
-				    {
-                        // no type for tha tone, dunno how to convert
-				        property = new PropertyResult(i.Key, i.Value, Guid.Empty, PropertyResultType.CustomProperty);
-				    }
+                    {
+                        // no type for that one, dunno how to convert
+				        IPublishedContentProperty property = new PropertyResult(i.Key, i.Value, Guid.Empty, PropertyResultType.CustomProperty);
+                        _properties.Add(property);
+                    }
                     else
                     {
-                        // use property type to ensure proper conversion
-                        var propertyType = _contentType.GetPropertyType(i.Key);
-
-                        // note: this is where U4-4144 and -3665 were born
-                        //
-                        // because propertyType is null, the XmlPublishedProperty ctor will throw
-                        // it's null because i.Key is not a valid property alias for the type...
-                        // the alias is case insensitive (verified) so it means it really is not
-                        // a correct alias. 
-                        //
-                        // in every cases this is after a ConvertFromXPathNavigator, so it means
-                        // that we get some properties from the XML that are not valid properties.
-                        // no idea which property. could come from the cache in library, could come
-                        // from so many places really.
-
-                        // workaround: just ignore that property
-                        if (propertyType == null)
-                        {
-                            LogHelper.Warn<PublishedMediaCache>("Dropping property \"" + i.Key + "\" because it does not belong to the content type.");
-                            continue;
-                        }
-
-                        property = new XmlPublishedProperty(propertyType, false, i.Value); // false :: never preview a media
+                        // this is a property that does not correspond to anything, ignore and log
+                        LogHelper.Warn<PublishedMediaCache>("Dropping property \"" + i.Key + "\" because it does not belong to the content type.");
                     }
-
-					_properties.Add(property);
 				}
 			}