diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp
index 97140b50d..4421a90ba 100644
--- a/soh/soh/Network/Archipelago/Archipelago.cpp
+++ b/soh/soh/Network/Archipelago/Archipelago.cpp
@@ -496,6 +496,9 @@ void ArchipelagoClient::SendDeathLink() {
 }
 
 void ArchipelagoClient::SetDeathLinkTag() {
+    if (!apClient) {
+        return;
+    }
     std::list<std::string> tags;
     if (CVarGetInteger(CVAR_REMOTE_ARCHIPELAGO("DeathLink"), 0)) {
         tags.push_back("DeathLink");