diff --git a/src/Client.cc b/src/Client.cc
index 32096148..fec43abb 100644
--- a/src/Client.cc
+++ b/src/Client.cc
@@ -55,7 +55,6 @@ Client::Client(
         event_free),
     card_battle_table_number(-1),
     card_battle_table_seat_number(0),
-    ep3_context_token(0),
     next_exp_value(0),
     override_section_id(-1),
     override_random_seed(-1),
diff --git a/src/Client.hh b/src/Client.hh
index 69f32ad4..ca3d890c 100644
--- a/src/Client.hh
+++ b/src/Client.hh
@@ -113,7 +113,6 @@ struct Client {
   std::unique_ptr<struct event, void(*)(struct event*)> save_game_data_event;
   int16_t card_battle_table_number;
   uint8_t card_battle_table_seat_number;
-  uint32_t ep3_context_token;
 
   // Miscellaneous (used by chat commands)
   uint32_t next_exp_value; // next EXP value to give
diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index 5a397663..0ad953f4 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -208,11 +208,6 @@ void on_connect(std::shared_ptr<ServerState> s, std::shared_ptr<Client> c) {
 }
 
 void on_login_complete(shared_ptr<ServerState> s, shared_ptr<Client> c) {
-  if (c->flags & Client::Flag::IS_EPISODE_3) {
-    c->ep3_context_token = random_object<uint32_t>();
-    send_ep3_set_context_token(c, c->ep3_context_token);
-  }
-
   // On the BB data server, this function is called only on the last connection
   // (when we should send the ship select menu).
   if ((c->server_behavior == ServerBehavior::LOGIN_SERVER) ||
@@ -921,9 +916,6 @@ static void on_ep3_server_data_request(shared_ptr<ServerState> s, shared_ptr<Cli
   if (header.subcommand != 0xB3) {
     throw runtime_error("unknown Episode 3 server data request");
   }
-  if (header.context_token != c->ep3_context_token) {
-    throw runtime_error("incorrect context token");
-  }
 
   if (!l->ep3_server_base || l->ep3_server_base->server->battle_finished) {
     if (!l->ep3_server_base) {