diff --git a/bukkit/src/main/java/com/griefdefender/GDPlayerData.java b/bukkit/src/main/java/com/griefdefender/GDPlayerData.java
index 2d02061..4d95b51 100644
--- a/bukkit/src/main/java/com/griefdefender/GDPlayerData.java
+++ b/bukkit/src/main/java/com/griefdefender/GDPlayerData.java
@@ -744,6 +744,7 @@ public void onDisconnect() {
         this.claimResizing = null;
         this.claimSubdividing = null;
         this.visualClaimId = null;
+        this.commandInputTimestamp = null;
         if (this.visualRevertTask != null) {
             this.visualRevertTask.cancel();
             this.visualRevertTask = null;
diff --git a/sponge/src/main/java/com/griefdefender/GDPlayerData.java b/sponge/src/main/java/com/griefdefender/GDPlayerData.java
index 890b470..16547ec 100644
--- a/sponge/src/main/java/com/griefdefender/GDPlayerData.java
+++ b/sponge/src/main/java/com/griefdefender/GDPlayerData.java
@@ -744,6 +744,7 @@ public void onDisconnect() {
         this.claimResizing = null;
         this.claimSubdividing = null;
         this.visualClaimId = null;
+        this.commandInputTimestamp = null;
         if (this.visualRevertTask != null) {
             this.visualRevertTask.cancel();
             this.visualRevertTask = null;
diff --git a/sponge/src/main/java/com/griefdefender/command/CommandTrustList.java b/sponge/src/main/java/com/griefdefender/command/CommandTrustList.java
index 7daa1aa..33b0c35 100644
--- a/sponge/src/main/java/com/griefdefender/command/CommandTrustList.java
+++ b/sponge/src/main/java/com/griefdefender/command/CommandTrustList.java
@@ -289,6 +289,15 @@ public static void showTrustList(Player src, GDClaim claim, GDPlayerData playerD
                         .append(ChatCaptureUtil.getInstance().createRecordChatComponent(src, claim, playerData, "trustlist", returnCommand))
                         .build();
             }
+        } else {
+            footer = TextComponent.empty();
+            if (messages != null && !messages.isEmpty()) {
+                for (Component message : messages) {
+                    footer = footer.append(message);
+                    fillSize -= 1;
+                }
+                messages.clear();
+            }
         }
 
         for (int i = 0; i < fillSize; i++) {
@@ -298,8 +307,6 @@ public static void showTrustList(Player src, GDClaim claim, GDPlayerData playerD
         PaginationList.Builder paginationBuilder = PaginationList.builder()
                 .title(claimTrustHead).padding(TextComponent.of(" ").decoration(TextDecoration.STRIKETHROUGH, true)).contents(trustList).footer(footer);
         paginationBuilder.sendTo(src);
-        paginationBuilder.sendTo(src);
-
     }
 
     private static Consumer<CommandSource> createTrustConsumer(Player src, GDClaim claim, GDPlayerData playerData, TrustType type, Component returnCommand) {