diff --git a/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6 b/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6
index 827bb4f..1090764 100644
--- a/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6
+++ b/assets/javascripts/discourse/controllers/knowledge-explorer.js.es6
@@ -51,9 +51,10 @@ export default Ember.Controller.extend({
     }
   },
 
-  @discourseComputed("topics", "isSearching")
-  emptyTopics(topics, isSearching) {
-    return topics.length === 0 && !isSearching ? true : false;
+  @discourseComputed("topics", "isSearching", "filterSolved")
+  emptyTopics(topics, isSearching, filterSolved) {
+    const filtered = isSearching || filterSolved;
+    return topics.length === 0 && !filtered;
   },
 
   @discourseComputed("loadMoreUrl")
@@ -66,6 +67,11 @@ export default Ember.Controller.extend({
     return !!searchTerm;
   },
 
+  @discourseComputed("isSearching", "filterSolved")
+  isSearchingOrFiltered(isSearching, filterSolved) {
+    return isSearching || filterSolved;
+  },
+
   @discourseComputed("isSearching", "model")
   searchCount(isSearching, model) {
     if (isSearching) return model.search_count;
@@ -73,6 +79,16 @@ export default Ember.Controller.extend({
 
   emptySearchResults: Ember.computed.equal("searchCount", 0),
 
+  @discourseComputed("topics")
+  emptyFilteredResults(topics) {
+    return topics.length === 0;
+  },
+
+  @discourseComputed("emptySearchResults", "emptyFilteredResults")
+  emptyResults(emptySearch, emptyFiltered) {
+    return emptySearch || emptyFiltered;
+  },
+
   @discourseComputed
   canFilterSolved() {
     return (
diff --git a/assets/javascripts/discourse/templates/knowledge-explorer.hbs b/assets/javascripts/discourse/templates/knowledge-explorer.hbs
index cbf2220..d643ff5 100644
--- a/assets/javascripts/discourse/templates/knowledge-explorer.hbs
+++ b/assets/javascripts/discourse/templates/knowledge-explorer.hbs
@@ -59,8 +59,8 @@
         {{/conditional-loading-spinner}}
       {{else}}
         <div class="knowledge-explorer-results">
-          {{#if isSearching}}
-            {{#if emptySearchResults}}
+          {{#if isSearchingOrFiltered}}
+            {{#if emptyResults}}
               <div class="result-count no-result">
                 {{i18n 'search.no_results'}}
               </div>
@@ -72,7 +72,7 @@
               </div>
             {{/if}}
           {{/if}}
-          {{#unless emptySearchResults}}
+          {{#unless emptyResults}}
             {{knowledge-explorer-topic-list
               topics=topics
               ascending=ascending