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 cca8e651f..c7eee03d9 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
@@ -400,11 +400,10 @@ public interface Player extends Entity, Actor {
      */
     default void unregister() {
         cancel(true);
+        getSession().setClipboard(null);
         if (Settings.IMP.HISTORY.DELETE_ON_LOGOUT) {
             getSession().clearHistory();
             getSession().unregisterTools(this);
-        } else if (Settings.IMP.CLIPBOARD.USE_DISK) {
-            getSession().setClipboard(null);
         }
     }