diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java
index 88713f4..5bdcd7a 100644
--- a/java/com/android/incallui/VideoCallPresenter.java
+++ b/java/com/android/incallui/VideoCallPresenter.java
@@ -691,8 +691,12 @@
   }
 
   private void checkForOrientationAllowedChange(@Nullable DialerCall call) {
-    InCallPresenter.getInstance()
-        .setInCallAllowsOrientationChange(isVideoCall(call) || isVideoUpgrade(call));
+    // Call could be null when video call ended. This check could prevent unwanted orientation
+    // change before incall UI gets destroyed.
+    if (call != null) {
+      InCallPresenter.getInstance()
+          .setInCallAllowsOrientationChange(isVideoCall(call) || isVideoUpgrade(call));
+    }
   }
 
   private void updateFullscreenAndGreenScreenMode(
