diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index e999b9b9e..879a3677e 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -5368,7 +5368,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         ];
     }
     
-    BOOL showMoreOption = ([event.wireType isEqual:kMXEventTypeStringRoomMember] && RiotSettings.shared.roomContextualMenuShowMoreOptionForStates) || (![event.wireType isEqual:kMXEventTypeStringRoomMember] && RiotSettings.shared.roomContextualMenuShowMoreOptionForMessages);
+    BOOL showMoreOption = (event.isState && RiotSettings.shared.roomContextualMenuShowMoreOptionForStates) || (!event.isState && RiotSettings.shared.roomContextualMenuShowMoreOptionForMessages);
     
     if (showMoreOption)
     {