diff --git a/core/server/controllers/frontend.js b/core/server/controllers/frontend.js
index 90310596cd..72fb6ee3ab 100644
--- a/core/server/controllers/frontend.js
+++ b/core/server/controllers/frontend.js
@@ -125,7 +125,7 @@ frontendControllers = {
             filters.doFilter('prePostsRender', page.posts).then(function (posts) {
                 api.settings.read('activeTheme').then(function (activeTheme) {
                     var paths = config().paths.availableThemes[activeTheme.value],
-                        view = paths.hasOwnProperty('tag') ? 'tag' : 'index',
+                        view = paths.hasOwnProperty('tag.hbs') ? 'tag' : 'index',
 
                         // Format data for template
                         response = _.extend(formatPageResponse(posts, page), {