--- a/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryAdapter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryAdapter.java
@@ -149,17 +149,17 @@ public class CombinedHistoryAdapter exte
                             // top of the list.
                             if (linearLayoutManager != null && scrollPos == 0) {
                                 linearLayoutManager.scrollToPosition(0);
                             }
                         } else {
                             notifyItemRemoved(RECENT_TABS_SMARTFOLDER_INDEX);
                         }
 
-                        if (countReliable) {
+                        if (countReliable && panelStateChangeListener != null) {
                             panelStateChangeListener.setCachedRecentTabsCount(recentTabsCount);
                         }
                     }
                 });
             }
         };
         return recentTabsUpdateHandler;
     }