diff --git a/src/com/xabber/android/data/message/MessageManager.java b/src/com/xabber/android/data/message/MessageManager.java
index 64874ac8b7..949b678e1c 100644
--- a/src/com/xabber/android/data/message/MessageManager.java
+++ b/src/com/xabber/android/data/message/MessageManager.java
@@ -247,6 +247,8 @@ public void closeChat(String account, String user) {
 		AbstractChat chat = getChat(account, user);
 		if (chat == null)
 			return;
+		if (chat instanceof RegularChat)
+			((RegularChat) chat).clearResource();
 		chat.closeChat();
 	}
 
diff --git a/src/com/xabber/android/data/message/RegularChat.java b/src/com/xabber/android/data/message/RegularChat.java
index 23ce9c2b8f..56179e2871 100644
--- a/src/com/xabber/android/data/message/RegularChat.java
+++ b/src/com/xabber/android/data/message/RegularChat.java
@@ -57,6 +57,10 @@ public String getResource() {
 		return resource;
 	}
 
+	public void clearResource() {
+		resource = null;
+	}
+
 	@Override
 	public String getTo() {
 		if (resource == null)