diff --git a/src/citra_meta/common_strings.h b/src/citra_meta/common_strings.h
index a0f1ed31b..4d78f3a05 100644
--- a/src/citra_meta/common_strings.h
+++ b/src/citra_meta/common_strings.h
@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -25,6 +25,10 @@ constexpr char help_string[] =
     // TODO: Move -m outside of this check when it is implemented in Qt frontend
     "-m, --multiplayer [nick:password@address:port]   Nickname, password, address and port for "
     "multiplayer (currently only usable with SDL frontend)\n"
+#endif
+#ifdef ENABLE_ROOM
+    "    --room                  Utilize dedicated multiplayer room functionality (equivalent to "
+    "the old citra-room executable)\n"
 #endif
     "-v, --version               Output version information and exit\n"
     "-w, --windowed              Start in windowed mode";
diff --git a/src/citra_meta/main.cpp b/src/citra_meta/main.cpp
index 847a6e6a3..5c8936f30 100644
--- a/src/citra_meta/main.cpp
+++ b/src/citra_meta/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
     }
 
     if (launch_room) {
-        LaunchRoom(argc, argv);
+        LaunchRoom(argc, argv, true);
         return 0;
     }
 #endif
diff --git a/src/citra_room/citra_room.cpp b/src/citra_room/citra_room.cpp
index 1bb0724d4..b956003f9 100644
--- a/src/citra_room/citra_room.cpp
+++ b/src/citra_room/citra_room.cpp
@@ -161,11 +161,16 @@ static void InitializeLogging(const std::string& log_file) {
 }
 
 /// Application entry point
-void LaunchRoom(int argc, char** argv) {
+void LaunchRoom(int argc, char** argv, bool called_by_option) {
     Common::DetachedTasks detached_tasks;
     int option_index = 0;
     char* endarg;
 
+    char* new_argv0 = argv[0];
+    if (called_by_option) {
+        strcat(new_argv0, " --room");
+    }
+
     std::string room_name;
     std::string room_description;
     std::string password;
diff --git a/src/citra_room/citra_room.h b/src/citra_room/citra_room.h
index d10d8f722..3d9b8749c 100644
--- a/src/citra_room/citra_room.h
+++ b/src/citra_room/citra_room.h
@@ -4,4 +4,4 @@
 
 #pragma once
 
-void LaunchRoom(int argc, char** argv);
+void LaunchRoom(int argc, char** argv, bool called_by_option);
diff --git a/src/citra_room_standalone/citra_room_standalone.cpp b/src/citra_room_standalone/citra_room_standalone.cpp
index 7bc6240ad..d06e53e0a 100644
--- a/src/citra_room_standalone/citra_room_standalone.cpp
+++ b/src/citra_room_standalone/citra_room_standalone.cpp
@@ -5,5 +5,5 @@
 #include "citra_room/citra_room.h"
 
 int main(int argc, char* argv[]) {
-    LaunchRoom(argc, argv);
+    LaunchRoom(argc, argv, false);
 }