diff --git a/app/src/main/java/be/ugent/sel/studeez/activities/MainActivity.kt b/app/src/main/java/be/ugent/sel/studeez/activities/MainActivity.kt
index 96868f1..02656bd 100644
--- a/app/src/main/java/be/ugent/sel/studeez/activities/MainActivity.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/activities/MainActivity.kt
@@ -48,7 +48,7 @@ class MainActivity : ComponentActivity() {
 
     override fun onStop() {
         onTimerInvisible = lifecycleScope.launch {
-            InvisibleSessionManager.updateTimer(mediaPlayer)
+            InvisibleSessionManager.updateTimer()
         }
         super.onStop()
     }
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt
index 9f009f4..7b0ad3c 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt
@@ -47,7 +47,7 @@ fun SessionScreen(
     mediaplayer.isLooping = false
 
     // evt mediaplayer meegeven vanaf hier als reserve oplossing
-    InvisibleSessionManager.setNewViewModel(viewModel = viewModel)
+    InvisibleSessionManager.setParameters(viewModel = viewModel, mediaplayer = mediaplayer)
 
     Column(
        modifier = Modifier.padding(10.dp)
@@ -153,25 +153,25 @@ private fun Timer(viewModel: SessionViewModel = hiltViewModel(), mediaplayer: Me
 }
 
 object InvisibleSessionManager {
-    lateinit var viewModel: SessionViewModel
+    private lateinit var viewModel: SessionViewModel
+    private lateinit var mediaplayer: MediaPlayer
     var isSession: Boolean = false
 
-    fun setNewViewModel(viewModel: SessionViewModel) {
+    fun setParameters(viewModel: SessionViewModel, mediaplayer: MediaPlayer) {
         isSession = true
         this.viewModel = viewModel
+        this.mediaplayer = mediaplayer
     }
 
-    suspend fun updateTimer(mediaPlayer: MediaPlayer?) {
+    suspend fun updateTimer() {
         if (isSession) {
             while (true) {
                 delay(1.seconds)
                 viewModel.getTimer().tick()
                 if (viewModel.getTimer().hasCurrentCountdownEnded() && !viewModel.getTimer().hasEnded()) {
-                    mediaPlayer?.start()
+                    mediaplayer.start()
                 }
             }
         }
     }
-
-
-}
\ No newline at end of file
+}