diff --git a/__pycache__/music_control.cpython-310.pyc b/__pycache__/music_control.cpython-310.pyc
index 6339040..686de09 100644
Binary files a/__pycache__/music_control.cpython-310.pyc and b/__pycache__/music_control.cpython-310.pyc differ
diff --git a/main.py b/main.py
index 48b75b1..ba94a7d 100644
--- a/main.py
+++ b/main.py
@@ -19,8 +19,6 @@ music_should_resume = False
 music_was_playing = False
 
 
-#test
-
 # =========================
 # KONFIGURATION
 # =========================
@@ -318,14 +316,15 @@ def status_wecker_skill(slots):
         return f"Es ist kein Wecker gestellt"
 
 def play_music_skill(slots):
-
     genre = slots["genre"]
 
     if not music_player.load_genre(genre):
         return f"Keine Musik im Genre {genre} gefunden"
     
+    speak(f"{genre} Musik wird abgespielt")
+
     music_player.play()
-    return f"{genre} Musik wird abgespielt"
+    return ""
 
 def pause_music_skill(slots):
     music_player.pause()
diff --git a/music_control.py b/music_control.py
index 46d80e6..c7f1ac8 100644
--- a/music_control.py
+++ b/music_control.py
@@ -26,6 +26,12 @@ class MusicPlayer:
         if not os.path.isdir(folder):
             return False
 
+        if self.playing or self.paused:
+            self.player.stop()
+            self.playing = False 
+            self.paused = False
+
+
         self.files = [
             os.path.join(folder, f)
             for f in os.listdir(folder)