diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 81b1ee6fa..b6cb0751e 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -316,6 +316,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
 	[super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
 	if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground) {
+		[self refreshImageDrawer];
 		return;
 	}
 	composingVisible = !composingVisible;
@@ -1679,7 +1680,7 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-	return [self canAdminEphemeral:_chatRoom] ? 3 : 2;
+	return (_chatRoom && [self canAdminEphemeral:_chatRoom]) ? 3 : 2;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {