diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs
index 491d2aeae..cacb42c0a 100644
--- a/Dalamud/Game/ClientState/ClientState.cs
+++ b/Dalamud/Game/ClientState/ClientState.cs
@@ -63,7 +63,7 @@ public sealed class ClientState : IDisposable, IServiceType
     public event EventHandler<ushort> TerritoryChanged;
 
     /// <summary>
-    /// Event that fires when a character is logging in.
+    /// Event that fires when a character is logging in, and the local character object is available.
     /// </summary>
     public event EventHandler Login;
 
@@ -167,7 +167,7 @@ public sealed class ClientState : IDisposable, IServiceType
         if (condition == null || gameGui == null || data == null)
             return;
 
-        if (condition.Any() && this.lastConditionNone == true)
+        if (condition.Any() && this.lastConditionNone == true && this.LocalPlayer != null)
         {
             Log.Debug("Is login");
             this.lastConditionNone = false;