diff --git a/app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt b/app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt
index ce763b5..57f4a2c 100644
--- a/app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt
+++ b/app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt
@@ -176,7 +176,7 @@ class AudioRecorderService :
         resetRecorder()
     }
 
-    override fun stop() {
+    override suspend fun stop() {
         super.stop()
 
         resetRecorder()
diff --git a/app/src/main/java/app/myzel394/alibi/services/IntervalRecorderService.kt b/app/src/main/java/app/myzel394/alibi/services/IntervalRecorderService.kt
index 5ab1171..2388308 100644
--- a/app/src/main/java/app/myzel394/alibi/services/IntervalRecorderService.kt
+++ b/app/src/main/java/app/myzel394/alibi/services/IntervalRecorderService.kt
@@ -55,7 +55,7 @@ abstract class IntervalRecorderService<S : IntervalRecorderService.Settings, I>
         createTimer()
     }
 
-    override fun stop() {
+    override suspend fun stop() {
         cycleTimer.shutdown()
     }
 
diff --git a/app/src/main/java/app/myzel394/alibi/services/RecorderService.kt b/app/src/main/java/app/myzel394/alibi/services/RecorderService.kt
index e550dfa..7b5865a 100644
--- a/app/src/main/java/app/myzel394/alibi/services/RecorderService.kt
+++ b/app/src/main/java/app/myzel394/alibi/services/RecorderService.kt
@@ -44,7 +44,7 @@ abstract class RecorderService : LifecycleService() {
     protected abstract fun start()
     protected abstract fun pause()
     protected abstract fun resume()
-    protected abstract fun stop()
+    protected abstract suspend fun stop()
 
     override fun onBind(intent: Intent): IBinder? {
         super.onBind(intent)
@@ -162,7 +162,7 @@ abstract class RecorderService : LifecycleService() {
         changeState(RecorderState.RECORDING)
     }
 
-    fun stopRecording() {
+    suspend fun stopRecording() {
         changeState(RecorderState.IDLE)
         stop()
     }
diff --git a/app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt b/app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt
index e5334ed..2bed4c8 100644
--- a/app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt
+++ b/app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.util.Range
 import androidx.camera.core.Camera
 import androidx.camera.core.CameraSelector
+import androidx.camera.core.impl.CameraConfig
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.video.FileOutputOptions
 import androidx.camera.video.Quality
@@ -11,6 +12,7 @@ import androidx.camera.video.QualitySelector
 import androidx.camera.video.Recorder
 import androidx.camera.video.Recording
 import androidx.camera.video.VideoCapture
+import androidx.camera.video.VideoRecordEvent
 import androidx.core.content.ContextCompat
 import app.myzel394.alibi.db.AppSettings
 import app.myzel394.alibi.db.RecordingInformation
@@ -38,11 +40,12 @@ class VideoRecorderService :
 
     // Used to listen and check if the camera is available
     private var _cameraAvailableListener = CompletableDeferred<Unit>()
+    private var _cameraClosedListener = CompletableDeferred<Unit>()
 
     private var selectedCamera: CameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
 
     // Runs a function in the main thread
-    private fun runInMain(callback: () -> Unit) {
+    private fun runOnMain(callback: () -> Unit) {
         val mainHandler = ContextCompat.getMainExecutor(this)
 
         mainHandler.execute(callback)
@@ -76,7 +79,7 @@ class VideoRecorderService :
         val recorder = buildRecorder()
         videoCapture = buildVideoCapture(recorder)
 
-        runInMain {
+        runOnMain {
             camera = cameraProvider!!.bindToLifecycle(
                 this,
                 selectedCamera,
@@ -91,10 +94,10 @@ class VideoRecorderService :
     // Used to close it finally, shouldn't be called when pausing / resuming.
     // This should only be called after recording has finished.
     private fun closeCamera() {
-        stopActiveRecording()
-
         runCatching {
-            cameraProvider?.unbindAll()
+            runOnMain {
+                cameraProvider?.unbindAll()
+            }
         }
 
         cameraProvider = null
@@ -110,9 +113,12 @@ class VideoRecorderService :
         }
     }
 
-    override fun stop() {
+    override suspend fun stop() {
         super.stop()
 
+        stopActiveRecording()
+        _cameraClosedListener.await()
+        // Camera can only be closed after the recording has been finalized
         closeCamera()
     }
 
@@ -134,7 +140,12 @@ class VideoRecorderService :
             activeRecording?.stop()
             val newRecording = prepareVideoRecording()
 
-            activeRecording = newRecording.start(ContextCompat.getMainExecutor(this), {})
+            activeRecording = newRecording.start(ContextCompat.getMainExecutor(this)) { event ->
+                // TODO: Add timeout to completer
+                if (event is VideoRecordEvent.Finalize) {
+                    _cameraClosedListener.complete(Unit)
+                }
+            }
         }
 
         if (_cameraAvailableListener.isCompleted) {
diff --git a/app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt b/app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt
index 13e5e34..9152a30 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt
@@ -128,7 +128,6 @@ abstract class BaseRecorderModel<S : IntervalRecorderService.Settings, I, T : In
 
     suspend fun stopRecording(context: Context) {
         recorderService!!.stopRecording()
-
     }
 
     fun pauseRecording() {
diff --git a/app/src/main/java/app/myzel394/alibi/ui/screens/POCVideo.kt b/app/src/main/java/app/myzel394/alibi/ui/screens/POCVideo.kt
index 4440718..670c4d1 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/screens/POCVideo.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/screens/POCVideo.kt
@@ -48,8 +48,6 @@ fun POCVideo(
                     val batchesFolder = videoRecorder.batchesFolder!!
                     videoRecorder.stopRecording(context)
 
-                    delay(5000)
-
                     batchesFolder.concatenate(
                         recordingStart = information.recordingStart,
                         extension = information.fileExtension,