diff --git a/mopidy/mpd/protocol/status.py b/mopidy/mpd/protocol/status.py
index d4aeb36f..3d76d35f 100755
--- a/mopidy/mpd/protocol/status.py
+++ b/mopidy/mpd/protocol/status.py
@@ -253,10 +253,6 @@ def _status_single(futures):
     return int(futures['tracklist.single'].get())
 
 
-def _status_songpos(futures):
-    return futures['tracklist.index'].get()
-
-
 def _status_songid(futures):
     current_tl_track = futures['playback.current_tl_track'].get()
     if current_tl_track is not None:
@@ -265,14 +261,18 @@ def _status_songid(futures):
         return _status_songpos(futures)
 
 
-def _status_nextsongpos(futures):
-    return futures['tracklist.next_index'].get()
+def _status_songpos(futures):
+    return futures['tracklist.index'].get()
 
 
 def _status_nextsongid(futures):
     return futures['tracklist.next_tlid'].get()
 
 
+def _status_nextsongpos(futures):
+    return futures['tracklist.next_index'].get()
+
+
 def _status_state(futures):
     state = futures['playback.state'].get()
     if state == PlaybackState.PLAYING: