diff --git a/src/de/ctdo/crashtest/mpd/MPDController.java b/src/de/ctdo/crashtest/mpd/MPDController.java
index 8eb38e5..2ee7446 100644
--- a/src/de/ctdo/crashtest/mpd/MPDController.java
+++ b/src/de/ctdo/crashtest/mpd/MPDController.java
@@ -154,10 +154,14 @@ public class MPDController implements  IMPDController {
                     try {
                         MPDPlaylist playlist = mpd.getMPDPlaylist();
                         playlist.clearPlaylist();
+                        mpd.getMPDPlayer().setRandom(false);
+                        mpd.getMPDPlayer().setXFade(1);
                     } catch (MPDConnectionException e) {
                         Logger.sLog("MPD error: " + e.getMessage());
                     } catch (MPDPlaylistException e) {
                         Logger.sLog("MPD error: " + e.getMessage());
+                    } catch (MPDPlayerException e) {
+                        Logger.sLog("MPD error: " + e.getMessage());
                     }
                 }
             };