diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
index ec77f57180..a02a7405f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
@@ -194,10 +194,10 @@ public class WebRtcCallView extends FrameLayout {
       remoteRenderContainer.setVisibility(View.GONE);
     }
 
-    if (shouldFadeControls && !wasRemoteVideoEnabled) {
+    if (isRemoteVideoEnabled && !wasRemoteVideoEnabled) {
+      fadeInControls();
+    } else if (!isRemoteVideoEnabled && wasRemoteVideoEnabled) {
       fadeInControls();
-    } else if (!shouldFadeControls && wasRemoteVideoEnabled) {
-      fadeOutControls();
       cancelFadeOut();
     }
   }