diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index f4d00f71..16183431 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1607,7 +1607,7 @@ namespace TShockAPI
 					}
 				}
 
-				if (banUuid)
+				if (banUuid && player.UUID.Length > 0)
 				{
 					banResult = DoBan($"{Identifier.UUID}{player.UUID}", reason, expiration);
 				}
diff --git a/TShockAPI/DB/BanManager.cs b/TShockAPI/DB/BanManager.cs
index 42892100..3e93a3b7 100644
--- a/TShockAPI/DB/BanManager.cs
+++ b/TShockAPI/DB/BanManager.cs
@@ -189,11 +189,15 @@ namespace TShockAPI.DB
 		{
 			List<string> identifiers = new List<string>
 			{
-				$"{Identifier.UUID}{player.UUID}",
 				$"{Identifier.Name}{player.Name}",
 				$"{Identifier.IP}{player.IP}"
 			};
 
+			if (player.UUID != null && player.UUID.Length > 0)
+			{
+				identifiers.Add($"{Identifier.UUID}{player.UUID}");
+			}
+
 			if (player.Account != null)
 			{
 				identifiers.Add($"{Identifier.Account}{player.Account.Name}");