diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/BreakSessionScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/BreakSessionScreen.kt
index 34927bc..8fa45ff 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/BreakSessionScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/BreakSessionScreen.kt
@@ -31,11 +31,13 @@ class BreakSessionScreen(
 
     override fun callMediaPlayer() {
         if (funPomoDoroTimer.hasEnded()) {
-            mediaplayer?.setOnCompletionListener {
-                mediaplayer!!.release()
-                mediaplayer = null
+            mediaplayer?.let { it: MediaPlayer ->
+                it.setOnCompletionListener {
+                    it.release()
+                    mediaplayer = null
+                }
+                it.start()
             }
-            mediaplayer?.start()
         } else if (funPomoDoroTimer.hasCurrentCountdownEnded()) {
             mediaplayer?.start()
         }
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/CustomSessionScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/CustomSessionScreen.kt
index e998645..7fc60bc 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/CustomSessionScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/CustomSessionScreen.kt
@@ -22,11 +22,13 @@ class CustomSessionScreen(
 
     override fun callMediaPlayer() {
         if (functionalTimer.hasEnded()) {
-            mediaplayer?.setOnCompletionListener {
-                mediaplayer!!.release()
-                mediaplayer = null
+            mediaplayer?.let { it: MediaPlayer ->
+                it.setOnCompletionListener {
+                    it.release()
+                    mediaplayer = null
+                }
+                it.start()
             }
-            mediaplayer?.start()
         }
     }