diff --git a/app/assets/javascripts/discourse/models/topic_list.js b/app/assets/javascripts/discourse/models/topic_list.js
index 8b92242d6..576d257ab 100644
--- a/app/assets/javascripts/discourse/models/topic_list.js
+++ b/app/assets/javascripts/discourse/models/topic_list.js
@@ -217,10 +217,12 @@ Discourse.TopicList.reopenClass({
           }
           return resolve(cachedList);
         }
+        session.set('topicList', null);
+      } else {
+        // Clear the cache
+        session.setProperties({topicList: null, topicListScrollPosition: null});
       }
 
-      // Clear the cache
-      session.setProperties({topicList: null, topicListScrollPosition: null});
 
       // Clean up any string parameters that might slip through
       filterParams = filterParams || {};