diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 7b1fc2bcb..edfab3b4c 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1121,7 +1121,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 
 	public void setCurrentChatRoomAddress(Address address) {
 		mCurrentChatRoomAddress = address;
-		LinphoneService.instance().setCurrentlyDisplayedChatRoom(address.asStringUriOnly());
+		LinphoneService.instance().setCurrentlyDisplayedChatRoom(address != null ? address.asStringUriOnly() : null);
 	}
 
 	@Override