diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs
index a8a5d58dc..72764f3a8 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using Orchard.ContentManagement;
@@ -22,6 +23,9 @@ namespace Orchard.MediaLibrary.Factories {
             if (!mimeType.StartsWith("image/")) {
                 return null;
             }
+            if (!ImageCodecInfo.GetImageDecoders().Select(d => d.MimeType).Contains(mimeType)) {
+                return null;
+            }
 
             if (!String.IsNullOrEmpty(contentType)) {
                 var contentDefinition = _contentDefinitionManager.GetTypeDefinition(contentType);