diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6 b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
index fa58bf51826..09ef6736c2f 100644
--- a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
+++ b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
@@ -35,6 +35,7 @@ export default (page) => {
     actions: {
       didTransition() {
         this.controllerFor("application").set("showFooter", true);
+        return true;
       }
     }
   });
diff --git a/app/assets/javascripts/discourse/routes/about.js.es6 b/app/assets/javascripts/discourse/routes/about.js.es6
index 9141db775fa..f25d64387bd 100644
--- a/app/assets/javascripts/discourse/routes/about.js.es6
+++ b/app/assets/javascripts/discourse/routes/about.js.es6
@@ -10,6 +10,7 @@ export default Discourse.Route.extend({
   actions: {
     didTransition() {
       this.controllerFor("application").set("showFooter", true);
+      return true;
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js.es6 b/app/assets/javascripts/discourse/routes/badges-index.js.es6
index c1c13445c05..dfb207391f6 100644
--- a/app/assets/javascripts/discourse/routes/badges-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-index.js.es6
@@ -14,6 +14,7 @@ export default Discourse.Route.extend({
   actions: {
     didTransition() {
       this.controllerFor("application").set("showFooter", true);
+      return true;
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6
index 97540914c77..61fd853d109 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6
@@ -62,6 +62,7 @@ Discourse.DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
 
     didTransition() {
       this.controllerFor("application").set("showFooter", true);
+      return true;
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index eb8abb275fa..98d182c42a3 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -3,7 +3,7 @@
   Handles the logic for showing the loading spinners.
 **/
 import OpenComposer from "discourse/mixins/open-composer";
-import { scrollTop } from 'discourse/mixins/scroll-top';
+import { scrollTop } from "discourse/mixins/scroll-top";
 
 const DiscoveryRoute = Discourse.Route.extend(OpenComposer, {
   redirect() {
@@ -21,20 +21,20 @@ const DiscoveryRoute = Discourse.Route.extend(OpenComposer, {
 
   actions: {
     loading() {
-      this.controllerFor('discovery').set("loading", true);
+      this.controllerFor("discovery").set("loading", true);
       return true;
     },
 
     loadingComplete() {
-      this.controllerFor('discovery').set('loading', false);
-      if (!this.session.get('topicListScrollPosition')) {
+      this.controllerFor("discovery").set("loading", false);
+      if (!this.session.get("topicListScrollPosition")) {
         scrollTop();
       }
     },
 
     didTransition() {
       this.controllerFor("discovery")._showFooter();
-      this.send('loadingComplete');
+      this.send("loadingComplete");
       return true;
     },
 
@@ -44,7 +44,7 @@ const DiscoveryRoute = Discourse.Route.extend(OpenComposer, {
     },
 
     createTopic() {
-      this.openComposer(this.controllerFor('discovery/topics'));
+      this.openComposer(this.controllerFor("discovery/topics"));
     }
   }
 
diff --git a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
index 3f5ae1272a9..926ba744e45 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
@@ -4,9 +4,9 @@ export default UserActivityStreamRoute.extend({
   userActionType: undefined,
 
   actions: {
-    didTransition: function() {
+    didTransition() {
       this._super();
-      this.controllerFor('user').set('indexStream', true);
+      this.controllerFor("user").set("indexStream", true);
       return true;
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
index e77b58da10f..7447d712179 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
@@ -2,20 +2,20 @@ import ViewingActionType from "discourse/mixins/viewing-action-type";
 
 export default Discourse.Route.extend(ViewingActionType, {
   model() {
-    return this.modelFor('user').get('stream');
+    return this.modelFor("user").get("stream");
   },
 
   afterModel() {
-    return this.modelFor('user').get('stream').filterBy(this.get('userActionType'));
+    return this.modelFor("user").get("stream").filterBy(this.get("userActionType"));
   },
 
   renderTemplate() {
-    this.render('user_stream');
+    this.render("user_stream");
   },
 
   setupController(controller, model) {
-    controller.set('model', model);
-    this.viewingActionType(this.get('userActionType'));
+    controller.set("model", model);
+    this.viewingActionType(this.get("userActionType"));
   },
 
   actions: {
@@ -26,13 +26,13 @@ export default Discourse.Route.extend(ViewingActionType, {
     },
 
     removeBookmark(userAction) {
-      var user = this.modelFor('user');
-      Discourse.Post.updateBookmark(userAction.get('post_id'), false)
+      var user = this.modelFor("user");
+      Discourse.Post.updateBookmark(userAction.get("post_id"), false)
         .then(function() {
           // remove the user action from the stream
-          user.get('stream').remove(userAction);
+          user.get("stream").remove(userAction);
           // update the counts
-          user.get('stats').forEach(function (stat) {
+          user.get("stats").forEach(function (stat) {
             if (stat.get("action_type") === userAction.action_type) {
               stat.decrementProperty("count");
             }
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js.es6 b/app/assets/javascripts/discourse/routes/user-badges.js.es6
index 4a89d50acf2..fcd099d7650 100644
--- a/app/assets/javascripts/discourse/routes/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-badges.js.es6
@@ -17,6 +17,7 @@ export default Discourse.Route.extend(ViewingActionType, {
   actions: {
     didTransition() {
       this.controllerFor("application").set("showFooter", true);
+      return true;
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
index 2b497d538f7..7c2384db01b 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
@@ -9,8 +9,7 @@ export default Discourse.Route.extend(ViewingActionType, {
   },
 
   model() {
-    var user = this.modelFor("user");
-    return this.store.find("notification", { username: user.get("username") });
+    return this.store.find("notification", { username: this.modelFor("user").get("username") });
   },
 
   setupController(controller, model) {