diff --git a/addon.xml b/addon.xml
index 93297b60f9ada3a32ebb364d8d3bb000046fae39..7822b80288289d2f6c59708cba89f0d7b9fc85a0 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.spotify.screensaver"
     name="Spotify Screensaver"
-    version="0.0.7"
+    version="0.0.8"
     provider-name="Benoît Harrault">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
diff --git a/gui.py b/gui.py
index 3968a753f9c23577c56d104d2a728a96fdeff9e0..eb803e2963d2f5185fced6aee0f930a6e5f0ed68 100644
--- a/gui.py
+++ b/gui.py
@@ -122,6 +122,9 @@ class GUI(xbmcgui.WindowXMLDialog):
             self.next = True
         elif event_type == 'preloading':
             self._preload_images(event_value)
+        elif event_type == 'paused' or event_type == 'stopped':
+            self._remove_images()
+            self.next = True
         else:
             self.log('unknown event type: ' + event_type, xbmc.LOGERROR)
 
@@ -135,6 +138,11 @@ class GUI(xbmcgui.WindowXMLDialog):
         self.PanelItems.reset()
         self.PanelItems.addItems(self._get_track_data(track_id))
 
+    def _remove_images(self):
+        self.log('no played track. remove images', xbmc.LOGERROR)
+        self.PanelItems = self.getControl(101)
+        self.PanelItems.reset()
+
     def _get_track_data(self, track_id):
         self.log('track_id: [' + str(track_id) + ']', xbmc.LOGERROR)