diff --git a/src/ascii_cmd.c b/src/ascii_cmd.c
index 375591c..f498c09 100644
--- a/src/ascii_cmd.c
+++ b/src/ascii_cmd.c
@@ -577,6 +577,6 @@ void process_ascii_cmd(RDSModulator* mod, char *str, char *cmd_output) {
 		}
 	}
 
-	if (cmd_output != NULL && cmd_reached) strcpy(cmd_output, output);
 	if (!cmd_reached) strcpy(output, "?");
+	if (cmd_output != NULL && cmd_reached) strcpy(cmd_output, output);
 }
\ No newline at end of file
diff --git a/src/udp_server.c b/src/udp_server.c
index 3ca29e4..ad79033 100644
--- a/src/udp_server.c
+++ b/src/udp_server.c
@@ -60,8 +60,8 @@ void poll_udp_server() {
             strncpy(cmd_buf, token, BUF_SIZE - 1);
 
             memset(cmd_output, 0, BUF_SIZE);
-            process_ascii_cmd(mod, cmd_buf, cmd_output);
-            run_lua(cmd_buf, NULL);
+            process_ascii_cmd(mod, cmd_buf, NULL);
+            run_lua(cmd_buf, cmd_output);
 
             size_t out_len = strlen(cmd_output);
             if (out_len > 0) {