diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index d26e3896..f3190670 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -453,7 +453,6 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
         showToggleCameraIfNeeded()
         if (mPreview?.resumeCamera() == true) {
             hideNavigationBarIcons()
-            mPreview?.checkFlashlight()
 
             if (!mIsInPhotoMode) {
                 initVideoButtons()
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
index c81ffa8c..336afb91 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
@@ -444,6 +444,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
     }
 
     override fun toggleFrontBackCamera() {
+        mUseFrontCamera = !mUseFrontCamera
     }
 
     override fun toggleFlashlight() {
@@ -472,7 +473,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
     }
 
     override fun checkFlashlight() {
-        if (mCameraState == STATE_PREVIEW) {
+        if (mCameraState == STATE_PREVIEW && mIsFlashSupported) {
             mPreviewRequestBuilder!!.set(CaptureRequest.FLASH_MODE, getFlashlightMode(mFlashlightState))
             mCaptureSession!!.setRepeatingRequest(mPreviewRequestBuilder!!.build(), mCaptureCallback, mBackgroundHandler)
             mActivity.updateFlashlightState(mFlashlightState)