diff --git a/NextcloudTalk/NCCallController.m b/NextcloudTalk/NCCallController.m
index f11325cc4..0f5e00de0 100644
--- a/NextcloudTalk/NCCallController.m
+++ b/NextcloudTalk/NCCallController.m
@@ -197,7 +197,6 @@ - (void)joinCall
                 [NCUtils log:[NSString stringWithFormat:@"Did join call in NCCallController for token %@", self.room.token]];
 
                 [self.delegate callControllerDidJoinCall:self];
-                [self getPeersForCall];
                 [self startMonitoringMicrophoneAudioLevel];
 
                 if (self->_externalSignalingController) {
@@ -205,6 +204,8 @@ - (void)joinCall
                         [self createPublisherPeerConnection];
                     }
                 } else {
+                    // Only with internal signaling we need to query the API for peers in call
+                    [self getPeersForCall];
                     [self->_signalingController startPullingSignalingMessages];
                 }
 
@@ -820,7 +821,7 @@ - (void)checkMicAudioLevel
     }];
 }
 
-#pragma mark - Call participants
+#pragma mark - Call participants (internal signaling)
 
 - (void)getPeersForCall
 {
@@ -1506,7 +1507,7 @@ - (void)processUsersInRoom:(NSArray *)users
     // Calculate sessions that join the call
     [newSessions removeObjectsInArray:oldSessions];
     
-    if (newSessions.count > 0) {
+    if (newSessions.count > 0 && !_externalSignalingController) {
         [self getPeersForCall];
     }