diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index b9aef1fa4..23ceeeef1 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -206,6 +206,7 @@ final class BuildSettings: NSObject {
     ]
     // Jitsi server used outside integrations to create conference calls from the call button in the timeline.
     // Setting this to nil effectively disables Jitsi conference calls (given that there is no wellknown override).
+    // Note: this will not remove the conference call button, use roomScreenAllowVoIPForNonDirectRoom setting.
     static let jitsiServerUrl: URL? = URL(string: "https://jitsi.riot.im")
 
     
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index e710d829e..f0ff98748 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -1611,8 +1611,7 @@ static CGSize kThreadListBarButtonItemImageSize;
     {
         return NO;
     }
-    BOOL callOptionAllowed = (self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForDirectRoom)
-    || (!self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForNonDirectRoom && self.mainSession.vc_homeserverConfiguration.jitsi.serverURL);
+    BOOL callOptionAllowed = (self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForDirectRoom) || (!self.roomDataSource.room.isDirect && RiotSettings.shared.roomScreenAllowVoIPForNonDirectRoom);
     return callOptionAllowed && BuildSettings.allowVoIPUsage && self.roomDataSource.mxSession.callManager && self.roomDataSource.room.summary.membersCount.joined >= 2;
 }