diff --git a/AUTHORS b/AUTHORS
index 2b09878b08..af1688f035 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,6 +24,7 @@ Gustavo Garcia <gustavogb@gmail.com>
 Hugues Ekra <hekra01@gmail.com>
 Jake Hilton <jakehilton@gmail.com>
 James H. Brown <jbrown@burgoyne.com>
+Jan Kalab <pitlicek@gmail.com>
 Jens Nielsen <jens.nielsen@berotec.se>
 Jiawei Ou <jiawei.ou@gmail.com>
 Jie Mao <maojie0924@gmail.com>
diff --git a/sdk/android/src/java/org/webrtc/CameraCapturer.java b/sdk/android/src/java/org/webrtc/CameraCapturer.java
index b9e22f18b0..08c6c6b0d5 100644
--- a/sdk/android/src/java/org/webrtc/CameraCapturer.java
+++ b/sdk/android/src/java/org/webrtc/CameraCapturer.java
@@ -50,11 +50,11 @@ abstract class CameraCapturer implements CameraVideoCapturer {
             stateLock.notifyAll();
 
             if (switchState == SwitchState.IN_PROGRESS) {
+              switchState = SwitchState.IDLE;
               if (switchEventsHandler != null) {
                 switchEventsHandler.onCameraSwitchDone(cameraEnumerator.isFrontFacing(cameraName));
                 switchEventsHandler = null;
               }
-              switchState = SwitchState.IDLE;
             } else if (switchState == SwitchState.PENDING) {
               switchState = SwitchState.IDLE;
               switchCameraInternal(switchEventsHandler);