diff --git a/source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java b/source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java
index 2e276fd634..6103caa198 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/AVMRemoteStore.java
@@ -37,11 +37,11 @@ import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.search.SearchService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptException;
 import org.springframework.extensions.webscripts.WebScriptResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * AVM Remote Store service.
@@ -151,11 +151,7 @@ public class AVMRemoteStore extends BaseRemoteStore
                         if (extIndex != -1)
                         {
                             String ext = path.substring(extIndex + 1);
-                            String mt = mimetypeService.getMimetypesByExtension().get(ext);
-                            if (mt != null)
-                            {
-                                mimetype = mt;
-                            }
+                            mimetype = mimetypeService.getMimetype(ext);
                         }
                     }
                     
diff --git a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
index a12cb7bb16..111a910c43 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
@@ -460,11 +460,7 @@ public class StreamContent extends AbstractWebScript
         int extIndex = filePath.lastIndexOf('.');
         if (extIndex != -1)
         {
-            String mt = mimetypeService.getMimetypesByExtension().get(filePath.substring(extIndex + 1));
-            if (mt != null)
-            {
-                mimetype = mt;
-            }
+            mimetype = mimetypeService.getMimetype(filePath.substring(extIndex + 1));
         }
         
         // setup file reader and stream
@@ -520,11 +516,7 @@ public class StreamContent extends AbstractWebScript
             if (extIndex != -1)
             {
                 String ext = extensionPath.substring(extIndex + 1);
-                String mt = mimetypeService.getMimetypesByExtension().get(ext);
-                if (mt != null)
-                {
-                    mimetype = mt;
-                }
+                mimetype = mimetypeService.getMimetype(ext);
             }
         }