diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java
index 0160180a9a..9a08402b44 100644
--- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java
+++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java
@@ -25,15 +25,15 @@ public void sendMessage(String message) {
 
     @Override
     public Optional<Entity> getEntity() {
-        if(delegate instanceof org.bukkit.entity.Entity entity) {
-            return Optional.of(BukkitAdapter.adapt(entity));
+        if(delegate.getExecutor() != null) {
+            return Optional.of(BukkitAdapter.adapt(delegate.getExecutor()));
         }
         return Optional.empty();
     }
 
     @Override
     public Optional<Player> getPlayer() {
-        if(delegate instanceof org.bukkit.entity.Player player) {
+        if(delegate.getSender() instanceof org.bukkit.entity.Player player) {
             return Optional.of(BukkitAdapter.adapt(player));
         }
         return Optional.empty();