diff --git a/desktop/tree.c b/desktop/tree.c
index 15118c3d2..c29afa761 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -212,7 +212,9 @@ static bool treeview_test_redraw(struct tree *tree, int x, int y,
 
 	switch (tree->flags) {
 	case TREE_SSLCERT:
-		sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx);
+		if (ssl_current_session != NULL) {
+			sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx);
+		}
 		return true;
 	case TREE_COOKIES:
 		cookie_manager_redraw(x, y, &clip, ctx);
diff --git a/desktop/tree.h b/desktop/tree.h
index a411437f0..c70f888dc 100644
--- a/desktop/tree.h
+++ b/desktop/tree.h
@@ -33,6 +33,10 @@ struct sslcert_session_data;
 struct tree;
 struct redraw_context;
 
+/** Current ssl session data for treeview
+ *
+ * @fixme global certificate treeview state must go away, this is just wrong.
+ */
 extern struct sslcert_session_data *ssl_current_session;
 extern const char *tree_hotlist_path;