diff --git a/SharedLibraryCore/PartialEntities/EFClient.cs b/SharedLibraryCore/PartialEntities/EFClient.cs
index b4bae5ac9..b52e56789 100644
--- a/SharedLibraryCore/PartialEntities/EFClient.cs
+++ b/SharedLibraryCore/PartialEntities/EFClient.cs
@@ -76,11 +76,11 @@ public virtual string Name
         [NotMapped]
         public virtual int? IPAddress
         {
-            get => CurrentAlias.IPAddress;
+            get => CurrentAlias?.IPAddress;
             set => CurrentAlias.IPAddress = value;
         }
 
-        [NotMapped] public string IPAddressString => IPAddress is null ? null : IPAddress.ConvertIPtoString();
+        [NotMapped] public string IPAddressString => IPAddress.ConvertIPtoString();
 
         [NotMapped] public bool IsIngame => ClientNumber >= 0;