diff --git a/android-app/app/src/main/java/com/usbwebcam/CameraHelper.kt b/android-app/app/src/main/java/com/usbwebcam/CameraHelper.kt
index fc29a98..23f6180 100644
--- a/android-app/app/src/main/java/com/usbwebcam/CameraHelper.kt
+++ b/android-app/app/src/main/java/com/usbwebcam/CameraHelper.kt
@@ -149,11 +149,32 @@ class CameraHelper(
     }
 
     private fun closeCamera() {
-        captureSession?.close()
+        try {
+            captureSession?.stopRepeating()
+            captureSession?.abortCaptures()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+        try {
+            captureSession?.close()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
         captureSession = null
-        imageReader?.close()
+
+        try {
+            imageReader?.close()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
         imageReader = null
-        cameraDevice?.close()
+
+        try {
+            cameraDevice?.close()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
         cameraDevice = null
     }
 }