diff --git a/app/src/main/java/app/myzel394/alibi/ui/models/AudioRecorderModel.kt b/app/src/main/java/app/myzel394/alibi/ui/models/AudioRecorderModel.kt
index aedac2e..f4fdf10 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/models/AudioRecorderModel.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/models/AudioRecorderModel.kt
@@ -14,7 +14,7 @@ import app.myzel394.alibi.services.AudioRecorderService
 import app.myzel394.alibi.ui.utils.MicrophoneInfo
 
 class AudioRecorderModel :
-    BaseRecorderModel<RecordingInformation, AudioRecorderService, AudioBatchesFolder?>() {
+    BaseRecorderModel<RecordingInformation, AudioBatchesFolder, AudioRecorderService>() {
     override var batchesFolder: AudioBatchesFolder? = null
     override val intentClass = AudioRecorderService::class.java
 
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 19c1c23..3fa71e1 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
@@ -19,7 +19,7 @@ import app.myzel394.alibi.services.RecorderNotificationHelper
 import app.myzel394.alibi.services.RecorderService
 import kotlinx.serialization.json.Json
 
-abstract class BaseRecorderModel<I, T : IntervalRecorderService<I>, B : BatchesFolder?> :
+abstract class BaseRecorderModel<I, B : BatchesFolder, T : IntervalRecorderService<I, B>> :
     ViewModel() {
     protected abstract val intentClass: Class<T>
 
@@ -47,7 +47,7 @@ abstract class BaseRecorderModel<I, T : IntervalRecorderService<I>, B : BatchesF
     // thus the service is not running and thus doesn't need to be stopped or destroyed
     var onRecordingSave: (isSavingAsOldRecording: Boolean) -> Unit = {}
     var onError: () -> Unit = {}
-    abstract var batchesFolder: B
+    abstract var batchesFolder: B?
 
     private var notificationDetails: RecorderNotificationHelper.NotificationDetails? = null