diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
index cadefa393e..5ecb224bdd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -202,19 +202,23 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
     lifecycleDisposable.add(controlsAndInfo);
 
-    logIntent(callIntent);
+    if (savedInstanceState == null) {
+      logIntent(callIntent);
 
-    if (callIntent.getAction() == CallIntent.Action.ANSWER_VIDEO) {
-      enableVideoIfAvailable = true;
-    } else if (callIntent.getAction() == CallIntent.Action.ANSWER_AUDIO || callIntent.isStartedFromFullScreen()) {
-      enableVideoIfAvailable = false;
+      if (callIntent.getAction() == CallIntent.Action.ANSWER_VIDEO) {
+        enableVideoIfAvailable = true;
+      } else if (callIntent.getAction() == CallIntent.Action.ANSWER_AUDIO || callIntent.isStartedFromFullScreen()) {
+        enableVideoIfAvailable = false;
+      } else {
+        enableVideoIfAvailable = callIntent.shouldEnableVideoIfAvailable();
+        callIntent.setShouldEnableVideoIfAvailable(false);
+      }
+
+      processIntent(callIntent);
     } else {
-      enableVideoIfAvailable = callIntent.shouldEnableVideoIfAvailable();
-      callIntent.setShouldEnableVideoIfAvailable(false);
+      Log.d(TAG, "Activity likely rotated, not processing intent");
     }
 
-    processIntent(callIntent);
-
     registerSystemPipChangeListeners();
 
     windowLayoutInfoConsumer = new WindowLayoutInfoConsumer();