diff --git a/build.gradle b/build.gradle
index 606021a978f09d64cfad0f72782e6a3a180ca671..f19f8e28aeefc21392ae39009953d67eb7242233 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,8 +92,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 369
-        versionName "2.8.0-alpha.3"
+        versionCode 370
+        versionName "2.8.0-alpha.4"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index cff788e0449bc7eb019bd02371d699c89a0fb07e..b1beee94513817d098b98c70f813328f30cec853 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -659,7 +659,6 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         final AbstractJingleConnection.Id id = requireRtpConnection().getId();
         if (account == id.account && id.with.equals(with) && id.sessionId.equals(sessionId)) {
             if (state == RtpEndUserState.ENDED) {
-                resetIntent(account, with, state, requireRtpConnection().getMedia());
                 finish();
                 return;
             } else if (END_CARD.contains(state)) {
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 f2a877d04262cc6b489ddfa1b81a4727574d2cce..5f0ccb43c38bb6f7dd3c8487ff7a8514783d071e 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -756,9 +756,14 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
             throw new IllegalStateException("RTP connection has not been initialized yet");
         }
         if (isInState(State.PROPOSED, State.PROCEED)) {
-            return Preconditions.checkNotNull(this.proposedMedia, "RTP connection has not been  initialized properly");
+            return Preconditions.checkNotNull(this.proposedMedia, "RTP connection has not been initialized properly");
+        }
+        final RtpContentMap initiatorContentMap = initiatorRtpContentMap;
+        if (initiatorContentMap != null) {
+            return initiatorContentMap.getMedia();
+        } else {
+            return Preconditions.checkNotNull(this.proposedMedia, "RTP connection has not been initialized properly");
         }
-        return Preconditions.checkNotNull(initiatorRtpContentMap.getMedia());
     }