diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java
index fdd75eecc..6e2cad713 100644
--- a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java
+++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java
@@ -22,7 +22,7 @@ public static void onPreShopCreation(PreShopCreationEvent event) {
         String name = event.getOwnerName();
 
         Player player = event.getPlayer();
-        UUID uuidForFullName = NameManager.getUUIDFor(name);
+        UUID uuidForFullName = name.isBlank() ? player.getUniqueId() : NameManager.getUUIDFor(name);
 
         if (!uuidForFullName.equals(player.getUniqueId()) && Permission.has(player, Permission.ADMIN)) {
             name = NameManager.getFullNameFor(uuidForFullName);