diff --git a/services/filestore/app/coffee/KeyBuilder.coffee b/services/filestore/app/coffee/KeyBuilder.coffee
index 03a65a8337..9b2a101e6b 100644
--- a/services/filestore/app/coffee/KeyBuilder.coffee
+++ b/services/filestore/app/coffee/KeyBuilder.coffee
@@ -25,7 +25,9 @@ module.exports =
 		
 	templateFileKey: (req, res, next)->
 		{template_id, format, version, sub_type} = req.params
-		req.key = "#{template_id}/v/#{version}/#{format}/#{sub_type}"
+		req.key = "#{template_id}/v/#{version}/#{format}"
+		if sub_type?
+			req.key = "#{req.key}/#{sub_type}"
 		req.bucket = settings.filestore.stores.template_files
 		req.version = version
 		opts = req.query