diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
index f044727c2..d4aa938d1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
@@ -90,11 +90,12 @@ public Object getDescriptor()
     @Override
     public void dispose()
     {
+        ChatRoom chatRoom = chatRoomWrapper.getChatRoom();
+        chatRoom.removeMemberPresenceListener(this);
+        chatRoom.removePropertyChangeListener(this);
+
         if(ConfigurationUtils.isLeaveChatRoomOnWindowCloseEnabled())
         {
-            ChatRoom chatRoom = chatRoomWrapper.getChatRoom();
-            chatRoom.removeMemberPresenceListener(this);
-            chatRoom.removePropertyChangeListener(this);
             chatRoom.leave();
         }
     }