diff --git a/TODO b/TODO
index 76825abe..48e6aa79 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@ everything related to posts:
         - comment count
         - regard safety settings
         - regard disliked settings
-        - add warning if no posts were found
         - search filters
             - comment:rr-
             - comment_count: 3..5
diff --git a/public_html/js/Presenters/PagerPresenter.js b/public_html/js/Presenters/PagerPresenter.js
index 466a9081..04aa2187 100644
--- a/public_html/js/Presenters/PagerPresenter.js
+++ b/public_html/js/Presenters/PagerPresenter.js
@@ -128,9 +128,18 @@ App.Presenters.PagerPresenter = function(
 		return promise.make(function(resolve, reject) {
 			pager.retrieve()
 				.then(function(response) {
-					showPageList();
 					updateCallback(response, forceClear || !endlessScroll);
 					forceClear = false;
+					if (!response.entities.length) {
+						messagePresenter.showInfo($messages, 'No data to show');
+						if (pager.getVisiblePages().length === 1) {
+							hidePageList();
+						} else  {
+							showPageList();
+						}
+					} else {
+						showPageList();
+					}
 
 					refreshPageList();
 					hideSpinner();