diff --git a/src/middleware/index.js b/src/middleware/index.js
index 13e0df1aee..7ec34e8719 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -73,7 +73,7 @@ function compileTemplates(pluginTemplates) {
 
 	utils.walk(baseTemplatesPath, function(err, baseTpls) {
 		utils.walk(themeTemplatesPath, function (err, themeTpls) {
-			var paths = pluginTemplates;
+			var paths = {};
 
 			if (!baseTpls || !themeTpls) {
 				winston.warn('[themes] Could not find base template files at: ' + baseTemplatesPath);
@@ -90,6 +90,12 @@ function compileTemplates(pluginTemplates) {
 				paths[themeTpls[i]] = path.join(themeTemplatesPath, themeTpls[i]);
 			});
 
+			for (var tpl in pluginTemplates) {
+				if (pluginTemplates.hasOwnProperty(tpl)) {
+					paths[tpl] = pluginTemplates[tpl];
+				}
+			}
+
 			async.each(Object.keys(paths), function(relativePath, next) {
 				var file = fs.readFileSync(paths[relativePath]).toString(),
 					matches = null,