diff --git a/functions.js b/functions.js
index 6cff3eacd..786023ffe 100644
--- a/functions.js
+++ b/functions.js
@@ -579,10 +579,11 @@ function parse_counters(reply, scheduled_call) {
 				setTimeout('updateFeedList(false, false)', 50);
 			}
 		} else {
-			cache_invalidate("FEEDLIST");
-			cache_inject("FEEDLIST", 
-				document.getElementById("feedList").innerHTML, 
-				getInitParam("num_feeds"));
+			var fl = document.getElementById("feeds-frame").innerHTML;
+			if (fl) {
+				cache_invalidate("FEEDLIST");
+				cache_inject("FEEDLIST", fl, getInitParam("num_feeds"));
+			}
 		}
 
 	} catch (e) {
diff --git a/tt-rss.js b/tt-rss.js
index 6048de057..1dd79c5f7 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -514,7 +514,11 @@ function init_second_stage() {
 
 		if (fl) {
 			render_feedlist(fl);
-			request_counters();
+			if (document.getElementById("feedList")) {
+				request_counters();
+			} else {
+				setTimeout('updateFeedList(false, false)', 50);
+			}
 		} else {
 			setTimeout('updateFeedList(false, false)', 50);
 		}