diff --git a/SharedLibraryCore/Services/ClientService.cs b/SharedLibraryCore/Services/ClientService.cs
index 0f3803c6..8a1680a0 100644
--- a/SharedLibraryCore/Services/ClientService.cs
+++ b/SharedLibraryCore/Services/ClientService.cs
@@ -321,7 +321,8 @@ namespace SharedLibraryCore.Services
             var name = originalName.CapClientName(EFAlias.MAX_NAME_LENGTH);
     
             var existingAliases = await context.Aliases
-                .Where(alias => alias.Name == name && alias.LinkId == entity.AliasLinkId)
+                .Where(alias => alias.Name == name && alias.LinkId == entity.AliasLinkId || 
+                                alias.Name == name && alias.IPAddress != null && alias.IPAddress == ip)
                 .ToListAsync();
             var defaultAlias = existingAliases.FirstOrDefault(alias => alias.IPAddress == null);
             var existingExactAlias =