diff --git a/Classes/HistoryListTableView.m b/Classes/HistoryListTableView.m
index 97f50fbce..2876d4a1a 100644
--- a/Classes/HistoryListTableView.m
+++ b/Classes/HistoryListTableView.m
@@ -22,6 +22,8 @@
 #import "LinphoneManager.h"
 #import "PhoneMainView.h"
 #import "Utils.h"
+#import "linphoneapp-Swift.h"
+
 
 @implementation HistoryListTableView
 
@@ -264,8 +266,15 @@
 				UIHistoryCell *cell = (UIHistoryCell *)[self tableView:tableView cellForRowAtIndexPath:indexPath];
 				[cell onDetails:self];
 			} else {
-				const LinphoneAddress *addr = linphone_call_log_get_remote_address(callLog);
-				[LinphoneManager.instance call:addr];
+				if (linphone_call_log_was_conference(callLog)) {
+					LinphoneConferenceInfo *confInfo = linphone_call_log_get_conference_info(callLog);
+					ConferenceWaitingRoomFragment *view = VIEW(ConferenceWaitingRoomFragment);
+					[view setDetailsWithSubject:[NSString stringWithUTF8String:linphone_conference_info_get_subject(confInfo)] url:[NSString stringWithUTF8String:linphone_address_as_string(linphone_conference_info_get_uri(confInfo))]];
+					[PhoneMainView.instance changeCurrentView:ConferenceWaitingRoomFragment.compositeViewDescription];
+				} else {
+					const LinphoneAddress *addr = linphone_call_log_get_remote_address(callLog);
+					[LinphoneManager.instance call:addr];
+				}
 			}
 		}
 	}