diff --git a/src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/SendingGui.java b/src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/SendingGui.java
index 5019fe67..31b3d9f0 100644
--- a/src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/SendingGui.java
+++ b/src/main/java/com/eternalcode/parcellockers/gui/implementation/locker/SendingGui.java
@@ -111,7 +111,7 @@ public void show(Player player) {
                                 return;
                             }
 
-                            this.state.parcelName(name);
+                            this.state.parcelName(name.trim());
                             this.noticeService.player(player.getUniqueId(), messages -> messages.parcel.nameSet);
 
                             this.updateNameItem();
@@ -155,8 +155,9 @@ public void show(Player player) {
                         200,
                         DialogAction.customClick((DialogResponseView view, Audience audience) -> {
                             String description = view.getText("description");
+                            String trimmedDescription = (description == null || description.isBlank()) ? null : description.trim();
 
-                            this.state.parcelDescription(description);
+                            this.state.parcelDescription(trimmedDescription);
                             this.noticeService.player(player.getUniqueId(), messages -> messages.parcel.descriptionSet);
 
                             this.updateDescriptionItem();