diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
index e1ec05c68..201a542db 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
@@ -392,6 +392,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
     @Override
     public void unregister() {
         player.removeMetadata("WE", WorldEditPlugin.getInstance());
+        super.unregister();
     }
 
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/entity/Player.java b/worldedit-core/src/main/java/com/sk89q/worldedit/entity/Player.java
index fe863604d..32f49f891 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/entity/Player.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/entity/Player.java
@@ -370,9 +370,10 @@ public interface Player extends Entity, Actor {
     default void unregister() {
         cancel(true);
         if (Settings.IMP.HISTORY.DELETE_ON_LOGOUT) {
-            getSession().setClipboard(null);
             getSession().clearHistory();
             getSession().unregisterTools(this);
+        } else if (Settings.IMP.CLIPBOARD.USE_DISK) {
+            getSession().setClipboard(null);
         }
     }