diff --git a/src/history_window.py b/src/history_window.py
index 4ce6907d8360d3b10218f6d084ba21dd9c7d7719..36e790191ace207d18ff326e81f2d956b975bd5f 100644
--- a/src/history_window.py
+++ b/src/history_window.py
@@ -156,6 +156,8 @@ class HistoryWindow:
 		if actual_jid in keys:
 			keys.remove(actual_jid)
 			keys.insert(0, actual_jid)
+		if None in keys:
+			keys.remove(None)
 		# Map jid to info tuple
 		# Warning : This for is time critical with big DB 
 		for key in keys: