diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 9ed32c0f7d6b2d2245dbbe289417f837ea1ad930..06fb99e3c80dd3888787c21836979ee0aced5678 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -147,6 +147,9 @@ public class JingleConnectionManager extends AbstractConnectionManager {
     }
 
     private void addNewIncomingCall(final JingleRtpConnection rtpConnection) {
+        if (true) {
+            return; // We do this inside the startRinging in the rtpConnection now so that fallback is possible
+        }
         if (rtpConnection.isTerminated()) {
             Log.d(
                     Config.LOGTAG,
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index 6390aad5f5fe8fb17a54f1de7cd819737a546fbd..1abcec154292f528f23c77a569d9a653ca0f142b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -37,6 +37,7 @@ import eu.siacs.conversations.entities.Conversational;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.entities.RtpSessionStatus;
 import eu.siacs.conversations.services.CallIntegration;
+import eu.siacs.conversations.services.CallIntegrationConnectionService;
 import eu.siacs.conversations.ui.RtpSessionActivity;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xml.Namespace;
@@ -1702,7 +1703,9 @@ public class JingleRtpConnection extends AbstractJingleConnection
                 jingleConnectionManager.schedule(
                         this::ringingTimeout, BUSY_TIME_OUT, TimeUnit.SECONDS);
         if (CallIntegration.selfManaged(xmppConnectionService)) {
-            return;
+            if (CallIntegrationConnectionService.addNewIncomingCall(xmppConnectionService, getId())) {
+                return;
+            }
         }
         xmppConnectionService.getNotificationService().startRinging(id, getMedia());
     }