diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts
index fe02b4528cb..8c736b252bc 100644
--- a/src/webrtc/call.ts
+++ b/src/webrtc/call.ts
@@ -292,6 +292,10 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
     public peerConn?: RTCPeerConnection;
     public toDeviceSeq = 0;
 
+    // whether this call should have push-to-talk semantics
+    // This should be set by the consumer on incoming & outgoing calls.
+    public isPtt = false;
+
     private client: MatrixClient;
     private forceTURN: boolean;
     private turnServers: Array<TurnServer>;
@@ -1876,9 +1880,10 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
         logger.debug(
             "Call ID " + this.callId + ": ICE connection state changed to: " + this.peerConn.iceConnectionState,
         );
+
         // ideally we'd consider the call to be connected when we get media but
         // chrome doesn't implement any of the 'onstarted' events yet
-        if (this.peerConn.iceConnectionState == 'connected') {
+        if (["connected", "completed"].includes(this.peerConn.iceConnectionState)) {
             clearTimeout(this.iceDisconnectedTimeout);
             this.setState(CallState.Connected);
 
@@ -1900,6 +1905,17 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
                 this.hangup(CallErrorCode.IceFailed, false);
             }, 30 * 1000);
         }
+
+        // In PTT mode, override feed status to muted when we lose connection to
+        // the peer, since we don't want to block the line if they're not saying anything.
+        // Experimenting in Chrome, this happens after 5 or 6 seconds, which is probably
+        // fast enough.
+        if (this.isPtt && !["connected", "completed"].includes(this.peerConn.iceConnectionState)) {
+            for (const feed of this.getRemoteFeeds()) {
+                feed.setAudioMuted(true);
+                feed.setVideoMuted(true);
+            }
+        }
     };
 
     private onSignallingStateChanged = (): void => {
diff --git a/src/webrtc/groupCall.ts b/src/webrtc/groupCall.ts
index 2110050525f..0b54e3a9809 100644
--- a/src/webrtc/groupCall.ts
+++ b/src/webrtc/groupCall.ts
@@ -610,6 +610,9 @@ export class GroupCall extends TypedEventEmitter<GroupCallEvent, GroupCallEventH
 
         logger.log(`GroupCall: incoming call from: ${opponentMemberId}`);
 
+        // we are handlng this call as a PTT call, so enable PTT semantics
+        newCall.isPtt = true;
+
         // Check if the user calling has an existing call and use this call instead.
         if (existingCall) {
             this.replaceCall(existingCall, newCall);
@@ -775,6 +778,8 @@ export class GroupCall extends TypedEventEmitter<GroupCallEvent, GroupCallEventH
             },
         );
 
+        newCall.isPtt = true;
+
         const requestScreenshareFeed = opponentDevice.feeds.some(
             (feed) => feed.purpose === SDPStreamMetadataPurpose.Screenshare);