diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 2cacac76c..bf9ac6e75 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -1975,6 +1975,8 @@ public void finished()
                 // Add incoming events accumulated while the history was loading
                 // at the end of the chat.
                 addIncomingEvents();
+
+                chatContainer.updateHistoryButtonState(ChatPanel.this);
             }
         };