diff --git a/src/Client.cc b/src/Client.cc
index f2075c68..450ed14b 100644
--- a/src/Client.cc
+++ b/src/Client.cc
@@ -36,7 +36,6 @@ ClientOptions::ClientOptions()
     override_random_seed(-1),
     save_files(false),
     enable_chat_filter(true),
-    block_events(false),
     suppress_remote_login(false),
     zero_remote_guild_card(false),
     function_call_return_value(-1) { }
diff --git a/src/Client.hh b/src/Client.hh
index a4876125..977e42ef 100644
--- a/src/Client.hh
+++ b/src/Client.hh
@@ -38,7 +38,6 @@ struct ClientOptions {
   // Options used only on proxy server
   bool save_files;
   bool enable_chat_filter;
-  bool block_events;
   bool suppress_remote_login;
   bool zero_remote_guild_card;
   int64_t function_call_return_value; // -1 = don't block function calls
diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index e1eb992a..d29f881d 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -102,7 +102,7 @@ static vector<MenuItem> proxy_options_menu_for_client(
         c->options.switch_assist ? u"Switch assist ON" : u"Switch assist OFF", u"", 0);
   }
   ret.emplace_back(ProxyOptionsMenuItemID::BLOCK_EVENTS,
-      c->options.block_events ? u"Block events ON" : u"Block events OFF", u"", 0);
+      (c->options.override_lobby_event >= 0) ? u"Block events ON" : u"Block events OFF", u"", 0);
   ret.emplace_back(ProxyOptionsMenuItemID::BLOCK_PATCHES,
       (c->options.function_call_return_value >= 0) ? u"Block patches ON" : u"Block patches OFF", u"", 0);
   if (s->proxy_allow_save_files) {
@@ -1763,7 +1763,11 @@ static void on_menu_selection(shared_ptr<ServerState> s, shared_ptr<Client> c,
           c->options.switch_assist = !c->options.switch_assist;
           goto resend_proxy_options_menu;
         case ProxyOptionsMenuItemID::BLOCK_EVENTS:
-          c->options.block_events = !c->options.block_events;
+          if (c->options.override_lobby_event >= 0) {
+            c->options.override_lobby_event = -1;
+          } else {
+            c->options.override_lobby_event = 0;
+          }
           goto resend_proxy_options_menu;
         case ProxyOptionsMenuItemID::BLOCK_PATCHES:
           if (c->options.function_call_return_value >= 0) {