diff --git a/src/net/listen.c b/src/net/listen.c
index 4e2ec3ed63611ec1fa51ee2fa1e8bf839cf25d51..c2a40d589be421bb96df3c1a5f943b93312f3d12 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -185,9 +185,9 @@ ___cmd_trie_init(void)
     cmd_trie_insert(cmd_trie_root, "next",              FUNCTION_POINTER(command_next),             LKT_COMMAND_ANON);
     cmd_trie_insert(cmd_trie_root, "previous",          FUNCTION_POINTER(command_previous),         LKT_COMMAND_ANON);
     cmd_trie_insert(cmd_trie_root, "pause",             FUNCTION_POINTER(command_pause),            LKT_COMMAND_ANON);
-    cmd_trie_insert(cmd_trie_root, "play",              FUNCTION_POINTER(command_next),             LKT_COMMAND_ANON);
-    cmd_trie_insert(cmd_trie_root, "playid",            FUNCTION_POINTER(command_next),             LKT_COMMAND_ANON);
-    cmd_trie_insert(cmd_trie_root, "stop",              FUNCTION_POINTER(command_next),             LKT_COMMAND_ANON);
+    cmd_trie_insert(cmd_trie_root, "play",              FUNCTION_POINTER(command_play),             LKT_COMMAND_ANON);
+    cmd_trie_insert(cmd_trie_root, "playid",            FUNCTION_POINTER(command_playid),           LKT_COMMAND_ANON);
+    cmd_trie_insert(cmd_trie_root, "stop",              FUNCTION_POINTER(command_stop),             LKT_COMMAND_ANON);
     cmd_trie_insert(cmd_trie_root, "seek",              FUNCTION_POINTER(command_seek),             LKT_COMMAND_ANON);
     cmd_trie_insert(cmd_trie_root, "seekid",            FUNCTION_POINTER(command_seekid),           LKT_COMMAND_ANON);
     cmd_trie_insert(cmd_trie_root, "seekcur",           FUNCTION_POINTER(command_seekcur),          LKT_COMMAND_ANON);
@@ -207,12 +207,6 @@ ___cmd_trie_init(void)
     cmd_trie_insert(cmd_trie_root, "swapid",            FUNCTION_POINTER(command_swapid),           LKT_COMMAND_ANON);
     cmd_trie_insert(cmd_trie_root, "__flat",            FUNCTION_POINTER(command_flat),             LKT_COMMAND_ANON);
 
-    cmd_trie_insert(cmd_trie_root, "random",            FUNCTION_POINTER(command_set_playback_option_random),  LKT_COMMAND_SIMPLE);
-    cmd_trie_insert(cmd_trie_root, "repeat",            FUNCTION_POINTER(command_set_playback_option_repeat),  LKT_COMMAND_SIMPLE);
-    cmd_trie_insert(cmd_trie_root, "setvol",            FUNCTION_POINTER(command_set_playback_option_volume),  LKT_COMMAND_SIMPLE);
-    cmd_trie_insert(cmd_trie_root, "single",            FUNCTION_POINTER(command_set_playback_option_single),  LKT_COMMAND_SIMPLE);
-    cmd_trie_insert(cmd_trie_root, "consume",           FUNCTION_POINTER(command_set_playback_option_consume), LKT_COMMAND_SIMPLE);
-
     cmd_trie_insert(cmd_trie_root, "playlistid",        FUNCTION_POINTER(command_queue_listid),     LKT_COMMAND_SIMPLE);
     cmd_trie_insert(cmd_trie_root, "playlist",          FUNCTION_POINTER(command_queue_list),       LKT_COMMAND_SIMPLE);
     cmd_trie_insert(cmd_trie_root, "playlistinfo",      FUNCTION_POINTER(command_queue_list),       LKT_COMMAND_SIMPLE);
@@ -239,6 +233,13 @@ ___cmd_trie_init(void)
     cmd_trie_insert(cmd_trie_root, "update",            FUNCTION_POINTER(command_update),           LKT_COMMAND_SIMPLE);
     cmd_trie_insert(cmd_trie_root, "rescan",            FUNCTION_POINTER(command_rescan_false),     LKT_COMMAND_SIMPLE);
     cmd_trie_insert(cmd_trie_root, "config",            FUNCTION_POINTER(command_config),           LKT_COMMAND_SIMPLE);
+
+    /* Playback next/prev control commands. */
+    cmd_trie_insert(cmd_trie_root, "random",            FUNCTION_POINTER(command_set_playback_option_random),  LKT_COMMAND_SIMPLE);
+    cmd_trie_insert(cmd_trie_root, "repeat",            FUNCTION_POINTER(command_set_playback_option_repeat),  LKT_COMMAND_SIMPLE);
+    cmd_trie_insert(cmd_trie_root, "setvol",            FUNCTION_POINTER(command_set_playback_option_volume),  LKT_COMMAND_SIMPLE);
+    cmd_trie_insert(cmd_trie_root, "single",            FUNCTION_POINTER(command_set_playback_option_single),  LKT_COMMAND_SIMPLE);
+    cmd_trie_insert(cmd_trie_root, "consume",           FUNCTION_POINTER(command_set_playback_option_consume), LKT_COMMAND_SIMPLE);
     // clang-format on
 
     cmd_trie_print(cmd_trie_root);