diff --git a/Classes/ChatConversationTableView.m b/Classes/ChatConversationTableView.m
index 584c2708b..884d920cd 100644
--- a/Classes/ChatConversationTableView.m
+++ b/Classes/ChatConversationTableView.m
@@ -251,7 +251,7 @@ static const int BASIC_EVENT_LIST=15;
 }
 
 - (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath*)indexPath {
-	if ([[cell reuseIdentifier] isEqualToString:@"UIChatBubblePhotoCell"]) {
+	if (!_chatRoom && [[cell reuseIdentifier] isEqualToString:@"UIChatBubblePhotoCell"]) {
 		[(UIChatBubbleTextCell *)cell clearEncryptedFiles];
 	}
 }
diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index eb0267797..1a9c2e2e8 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -67,6 +67,7 @@
 		if (PhoneMainView.instance.currentView == ChatConversationView.compositeViewDescription) {
 			ChatConversationView *view = VIEW(ChatConversationView);
 			[view removeCallBacks];
+			[view.tableController setChatRoom:NULL];
 		} else if (PhoneMainView.instance.currentView == ChatConversationInfoView.compositeViewDescription) {
 			ChatConversationInfoView *view = VIEW(ChatConversationInfoView);
 			[view removeCallbacks];