diff --git a/web/app/assets/javascripts/findSession.js b/web/app/assets/javascripts/findSession.js
index 7a5831f37..df765fb3a 100644
--- a/web/app/assets/javascripts/findSession.js
+++ b/web/app/assets/javascripts/findSession.js
@@ -27,6 +27,8 @@
     var $ssNext = null;
     var $ssScroller = null;
     var $ssSpinner = null;
+    var $noActiveSessionsMsgSelector = $('#no-active-sessions');
+    var $noScheduledSessionsMsgSelector = $('#no-scheduled-sessions');
     var currentScheduledSessionsPage = 0;
     var currentScheduledSessionsQuery = defaultScheduledSessionsQuery();
 
@@ -45,6 +47,8 @@
     function loadSessions() {
       $asSpinner.show();
       $ssSpinner.show();
+      $noActiveSessionsMsgSelector.hide();
+      $noScheduledSessionsMsgSelector.hide();
 
       // get active sessions
       rest.findActiveSessions(currentActiveSessionsQuery)
@@ -132,15 +136,12 @@
       return currentActiveSessionsQuery;
     }
 
-    function afterLoadActiveSessions(sessionList) {
-
-      var $noSessionsMsgSelector = $('#no-active-sessions');
-      
+    function afterLoadActiveSessions(sessionList) {      
       if (sessionList.length === 0) {
-        $noSessionsMsgSelector.show();
+        $noActiveSessionsMsgSelector.show();
       }
       else {
-        $noSessionsMsgSelector.hide();
+        $noActiveSessionsMsgSelector.hide();
       }
 
       buildActiveSessionsQuery();
@@ -199,16 +200,14 @@
 
     function afterLoadScheduledSessions(sessionList) {
 
-      var $noSessionsMsgSelector = $('#no-scheduled-sessions');
-
       if(sessionList.length < SCHEDULED_SESSIONS_LIMIT) {
         // if we retrieve less results than asked for, end searching
         $ssScroller.infinitescroll('pause');
-        $noSessionsMsgSelector.show();
+        $noScheduledSessionsMsgSelector.show();
         $('.infinite-scroll-loader').remove();
       }
       else {
-        // $noSessionsMsgSelector.hide();
+        $noScheduledSessionsMsgSelector.hide();
         currentScheduledSessionsPage++;
         buildScheduledSessionsQuery();
         registerScheduledSessionInfiniteScroll();