diff --git a/src/jukebox/components/playermpd/__init__.py b/src/jukebox/components/playermpd/__init__.py
index 772b8c654..86dbc60ab 100644
--- a/src/jukebox/components/playermpd/__init__.py
+++ b/src/jukebox/components/playermpd/__init__.py
@@ -159,6 +159,7 @@ def __init__(self):
         self.end_of_playlist_next_action = utils.get_config_action(cfg,
                                                                    'playermpd',
                                                                    'end_of_playlist_next_action',
+                                                                   'none',
                                                                    {'rewind': self.rewind,
                                                                     'stop': self.stop,
                                                                     'none': lambda: None},
@@ -166,13 +167,15 @@ def __init__(self):
         self.stopped_prev_action = utils.get_config_action(cfg,
                                                            'playermpd',
                                                            'stopped_prev_action',
+                                                           'prev',
                                                            {'rewind': self.rewind,
                                                             'prev': self._prev_in_stopped_state,
                                                             'none': lambda: None},
                                                            logger)
-        self.stopped_next_action = utils.get_current_song(cfg,
+        self.stopped_next_action = utils.get_config_action(cfg,
                                                           'playermpd',
                                                           'stopped_next_action',
+                                                          'next',
                                                           {'rewind': self.rewind,
                                                            'next': self._next_in_stopped_state,
                                                            'none': lambda: None},