diff --git a/webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java b/webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java
index 45a5fcbda3..d002925215 100644
--- a/webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java
@@ -184,8 +184,13 @@ public class VideoCapturerAndroid
         }
       }
     });
-    if (!didPost && switchEventsHandler != null) {
-      switchEventsHandler.onCameraSwitchError("Camera is stopped.");
+    if (!didPost) {
+      synchronized (pendingCameraSwitchLock) {
+        pendingCameraSwitch = false;
+      }
+      if (switchEventsHandler != null) {
+        switchEventsHandler.onCameraSwitchError("Camera is stopped.");
+      }
     }
   }