diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index 93f808b5..a8c9cd4d 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -1550,16 +1550,6 @@ static void on_CA_Ep3(shared_ptr<Client> c, uint16_t, uint32_t, string& data) {
   if (!l->ep3_server || l->ep3_server->battle_finished) {
     auto s = c->require_server_state();
 
-    l->create_ep3_server();
-
-    if (s->ep3_behavior_flags & Episode3::BehaviorFlag::ENABLE_STATUS_MESSAGES) {
-      for (size_t z = 0; z < l->max_clients; z++) {
-        if (l->clients[z]) {
-          send_text_message_printf(l->clients[z], "Your client ID: $C6%zu", z);
-        }
-      }
-    }
-
     if (s->ep3_behavior_flags & Episode3::BehaviorFlag::ENABLE_RECORDING) {
       l->battle_record = make_shared<Episode3::BattleRecord>(s->ep3_behavior_flags);
       for (auto existing_c : l->clients) {
@@ -1576,10 +1566,9 @@ static void on_CA_Ep3(shared_ptr<Client> c, uint16_t, uint32_t, string& data) {
               c->ep3_config ? (c->ep3_config->online_clv_exp / 100) : 0);
         }
       }
-      if (s->ep3_behavior_flags & Episode3::BehaviorFlag::ENABLE_STATUS_MESSAGES) {
-        send_text_message(l, "$C7Recording enabled");
-      }
     }
+
+    l->create_ep3_server();
   }
 
   bool battle_finished_before = l->ep3_server->battle_finished;
diff --git a/tests/GC-Episode3Battle.test.txt b/tests/GC-Episode3Battle.test.txt
index e0b7dae3..62f6ee17 100644
--- a/tests/GC-Episode3Battle.test.txt
+++ b/tests/GC-Episode3Battle.test.txt
@@ -4019,14 +4019,6 @@ I 16332 2023-09-17 10:14:46 - [Commands] Sending to C-2 (Tali) (version=GC comma
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 16332 2023-09-17 10:14:46 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
-0000 | B0 00 24 00 00 00 00 00 00 00 00 00 59 6F 75 72 |   $         Your
-0010 | 20 63 6C 69 65 6E 74 20 49 44 3A 20 09 43 36 30 |  client ID:  C60
-0020 | 00 00 00 00                                     |
-I 16332 2023-09-17 10:14:46 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
-0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 37 52 |   $          C7R
-0010 | 65 63 6F 72 64 69 6E 67 20 65 6E 61 62 6C 65 64 | ecording enabled
-0020 | 00 00 00 00                                     |
-I 16332 2023-09-17 10:14:46 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 30 |   $          C50
 0010 | 2F 43 41 78 34 39 20 43 41 52 44 20 43 4F 55 4E | /CAx49 CARD COUN
 0020 | 54 53 00 00                                     | TS
@@ -30420,14 +30412,6 @@ I 16332 2023-09-17 10:22:26 - [Commands] Sending to C-2 (Tali) (version=GC comma
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 16332 2023-09-17 10:22:26 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
-0000 | B0 00 24 00 00 00 00 00 00 00 00 00 59 6F 75 72 |   $         Your
-0010 | 20 63 6C 69 65 6E 74 20 49 44 3A 20 09 43 36 30 |  client ID:  C60
-0020 | 00 00 00 00                                     |
-I 16332 2023-09-17 10:22:26 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
-0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 37 52 |   $          C7R
-0010 | 65 63 6F 72 64 69 6E 67 20 65 6E 61 62 6C 65 64 | ecording enabled
-0020 | 00 00 00 00                                     |
-I 16332 2023-09-17 10:22:26 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 30 |   $          C50
 0010 | 2F 43 41 78 34 39 20 43 41 52 44 20 43 4F 55 4E | /CAx49 CARD COUN
 0020 | 54 53 00 00                                     | TS
diff --git a/tests/GC-Episode3BattleWithSpectator.test.txt b/tests/GC-Episode3BattleWithSpectator.test.txt
index ef52bd71..596ff42a 100644
--- a/tests/GC-Episode3BattleWithSpectator.test.txt
+++ b/tests/GC-Episode3BattleWithSpectator.test.txt
@@ -4019,14 +4019,6 @@ I 17097 2023-09-19 21:52:59 - [Commands] Sending to C-2 (Tali) (version=GC comma
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 17097 2023-09-19 21:52:59 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
-0000 | B0 00 24 00 00 00 00 00 00 00 00 00 59 6F 75 72 |   $         Your
-0010 | 20 63 6C 69 65 6E 74 20 49 44 3A 20 09 43 36 30 |  client ID:  C60
-0020 | 00 00 00 00                                     |
-I 17097 2023-09-19 21:52:59 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
-0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 37 52 |   $          C7R
-0010 | 65 63 6F 72 64 69 6E 67 20 65 6E 61 62 6C 65 64 | ecording enabled
-0020 | 00 00 00 00                                     |
-I 17097 2023-09-19 21:52:59 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 30 |   $          C50
 0010 | 2F 43 41 78 34 39 20 43 41 52 44 20 43 4F 55 4E | /CAx49 CARD COUN
 0020 | 54 53 00 00                                     | TS
@@ -77257,14 +77249,6 @@ I 17097 2023-09-19 22:11:24 - [Commands] Sending to C-2 (Tali) (version=GC comma
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 17097 2023-09-19 22:11:24 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
-0000 | B0 00 24 00 00 00 00 00 00 00 00 00 59 6F 75 72 |   $         Your
-0010 | 20 63 6C 69 65 6E 74 20 49 44 3A 20 09 43 36 30 |  client ID:  C60
-0020 | 00 00 00 00                                     |
-I 17097 2023-09-19 22:11:24 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
-0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 37 52 |   $          C7R
-0010 | 65 63 6F 72 64 69 6E 67 20 65 6E 61 62 6C 65 64 | ecording enabled
-0020 | 00 00 00 00                                     |
-I 17097 2023-09-19 22:11:24 - [Commands] Sending to C-2 (Tali) (version=GC command=B0 flag=00)
 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 30 |   $          C50
 0010 | 2F 43 41 78 34 39 20 43 41 52 44 20 43 4F 55 4E | /CAx49 CARD COUN
 0020 | 54 53 00 00                                     | TS