diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index 98f05c8df5b..cdad09f8bd9 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -141,8 +141,10 @@ export default Ember.DefaultResolver.extend({
   },
 
   findPluginMobileTemplate(parsedName) {
-    var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/mobile/"));
-    return this.findTemplate(pluginParsedName);
+    if (this.mobileView) {
+      var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/mobile/"));
+      return this.findTemplate(pluginParsedName);
+    }
   },
 
   findMobileTemplate(parsedName) {