diff --git a/src/player.js b/src/player.js
index afb6a390..a49027a2 100644
--- a/src/player.js
+++ b/src/player.js
@@ -110,6 +110,9 @@ class ClapperPlayer extends PlayerBase
 
     set_playlist(playlist)
     {
+        if(this.state !== GstClapper.ClapperState.STOPPED)
+            this.stop();
+
         this.playlistWidget.removeAll();
         this.canAutoFullscreen = true;