diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt
index 4507e36e3a..d0e0989722 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt
@@ -87,6 +87,9 @@ class CallLinkPreJoinActionProcessor(
 
     SignalStore.tooltips().markGroupCallingLobbyEntered()
     return currentState.builder()
+      .changeCallSetupState(RemotePeer.GROUP_CALL_ID)
+      .setRingGroup(false)
+      .commit()
       .changeCallInfoState()
       .groupCall(groupCall)
       .groupCallState(WebRtcViewModel.GroupCallState.DISCONNECTED)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
index be1be1a6f9..bd3bb38617 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
@@ -973,6 +973,11 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
   }
 
   public void sendGroupCallUpdateMessage(@NonNull Recipient recipient, @Nullable String groupCallEraId, boolean isIncoming, boolean isJoinEvent) {
+    if (recipient.isCallLink()) {
+      Log.i(TAG, "sendGroupCallUpdateMessage -- ignoring for call link");
+      return;
+    }
+
     SignalExecutors.BOUNDED.execute(() -> {
       GroupCallUpdateSendJob updateSendJob = GroupCallUpdateSendJob.create(recipient.getId(), groupCallEraId);
       JobManager.Chain       chain         = ApplicationDependencies.getJobManager().startChain(updateSendJob);