diff --git a/website/client/js/controllers/rootCtrl.js b/website/client/js/controllers/rootCtrl.js
index 71ce8306b4..621b9be725 100644
--- a/website/client/js/controllers/rootCtrl.js
+++ b/website/client/js/controllers/rootCtrl.js
@@ -22,8 +22,8 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
         $rootScope.pageTitle = $state.current.title;
 
         if (!!fromState.name) Analytics.track({'hitType':'pageview','eventCategory':'navigation','eventAction':'navigate','page':'/#/'+toState.name});
-        // clear inbox when entering or exiting inbox tab
-        if (fromState.name=='options.social.inbox' || toState.name=='options.social.inbox') {
+        // clear inbox when entering inbox tab
+        if (toState.name=='options.social.inbox') {
           User.clearNewMessages();
         }
       });
diff --git a/website/client/js/services/userServices.js b/website/client/js/services/userServices.js
index a4231298e0..67f3348033 100644
--- a/website/client/js/services/userServices.js
+++ b/website/client/js/services/userServices.js
@@ -106,6 +106,9 @@ angular.module('habitrpg')
         .then(function (response) {
           var tasks = response.data.data;
           syncUserTasks(tasks);
+          if ($rootScope.$state && $rootScope.$state.current.name=='options.social.inbox') {
+            userServices.clearNewMessages();
+          }
           $rootScope.$emit('userSynced');
           $rootScope.appLoaded = true;
           $rootScope.$emit('userUpdated', user);