diff --git a/services/camera/libcameraservice/Camera3Device.cpp b/services/camera/libcameraservice/Camera3Device.cpp
index 0b5e9c4..c7edb76 100644
--- a/services/camera/libcameraservice/Camera3Device.cpp
+++ b/services/camera/libcameraservice/Camera3Device.cpp
@@ -1125,7 +1125,7 @@
     ALOGE("Camera %d: %s", mId, errorCause.string());
 
     // But only do error state transition steps for the first error
-    if (mStatus == STATUS_ERROR) return;
+    if (mStatus == STATUS_ERROR || mStatus == STATUS_UNINITIALIZED) return;
 
     mErrorCause = errorCause;