diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
index 223fe6f09..7e1fb3ff6 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -1431,12 +1431,12 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
     }
 
     @Override
-    public @NonNull UUID playerUuid() {
-        return playerEntity.getUuid();
+    public UUID playerUuid() {
+        return javaUuid(); // CommandSource allows nullable
     }
 
     @Override
-    public @NonNull GeyserSession connection() {
+    public GeyserSession connection() {
         return this;
     }