diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 02e745a60..b6c3d88eb 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -1181,7 +1181,10 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
          }];
     }
     
-    [self cancelEventSelection];
+    if (customizedRoomDataSource.selectedEventId)
+    {
+        [self cancelEventSelection];
+    }
 }
 
 - (void)setRoomTitleViewClass:(Class)roomTitleViewClass