diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
index 4691ddcb36..909d5958ba 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
@@ -136,10 +136,10 @@ public class ContentGet extends StreamContent implements ServletContextAware
         }
 
         // Stream the content
-        streamContentLocal(req, res, nodeRef, attach, propertyQName);
+        streamContentLocal(req, res, nodeRef, attach, propertyQName, null);
     }
 
-    private void streamContentLocal(WebScriptRequest req, WebScriptResponse res, NodeRef nodeRef, boolean attach, QName propertyQName) throws IOException
+    protected void streamContentLocal(WebScriptRequest req, WebScriptResponse res, NodeRef nodeRef, boolean attach, QName propertyQName, Map<String, Object> model) throws IOException
     {
         String userAgent = req.getHeader("User-Agent");
         userAgent = userAgent != null ? userAgent.toLowerCase() : "";
@@ -160,11 +160,11 @@ public class ContentGet extends StreamContent implements ServletContextAware
                 }
             }
             
-            streamContent(req, res, nodeRef, propertyQName, attach, name, null);
+            streamContent(req, res, nodeRef, propertyQName, attach, name, model);
         }
         else
         {
-            streamContent(req, res, nodeRef, propertyQName, attach, null, null);
+            streamContent(req, res, nodeRef, propertyQName, attach, null, model);
         }
     }
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java b/source/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java
index 315eacb849..2992c53f52 100644
--- a/source/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java
@@ -28,6 +28,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.model.QuickShareModel;
 import org.alfresco.repo.tenant.TenantUtil;
 import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.web.scripts.content.ContentGet;
 import org.alfresco.repo.web.scripts.content.StreamContent;
 import org.alfresco.service.cmr.quickshare.InvalidSharedIdException;
 import org.alfresco.service.cmr.quickshare.QuickShareService;
@@ -55,7 +56,7 @@ import org.springframework.web.context.ServletContextAware;
  * @author janv
  * @since Cloud/4.2
  */
-public class QuickShareContentGet extends StreamContent implements ServletContextAware
+public class QuickShareContentGet extends ContentGet implements ServletContextAware
 {
     private static final Log logger = LogFactory.getLog(QuickShareContentGet.class);
     
@@ -174,6 +175,6 @@ public class QuickShareContentGet extends StreamContent implements ServletContex
         boolean attach = Boolean.valueOf(req.getParameter("a"));
         
         // Stream the content
-        streamContent(req, res, nodeRef, propertyQName, attach, null, model);
+        streamContentLocal(req, res, nodeRef, attach, propertyQName, model);
 	}
 }
\ No newline at end of file