diff --git a/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JContextObjectProvider.java b/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JContextObjectProvider.java
index 82b42ff..d16f789 100644
--- a/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JContextObjectProvider.java
+++ b/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JContextObjectProvider.java
@@ -71,7 +71,7 @@ public class Discord4JContextObjectProvider implements ContextObjectProvider {
         ComponentInteractionEvent componentInteractionEvent = (ComponentInteractionEvent) context;
         switch (type.getName()) {
             case "discord4j.core.object.entity.Message":
-                return componentInteractionEvent.getMessage();
+                return componentInteractionEvent.getMessage().orElse(null);
             default:
                 return getInteractionContextObject(context, type);
         }