diff --git a/modules/commands/magic8.py b/modules/commands/magic8_command.py
similarity index 81%
rename from modules/commands/magic8.py
rename to modules/commands/magic8_command.py
index 8f8eaf0..304cafc 100644
--- a/modules/commands/magic8.py
+++ b/modules/commands/magic8_command.py
@@ -36,4 +36,13 @@ class Magic8Command(BaseCommand):
     async def execute(self, message: MeshMessage) -> bool:
         """Execute the magic8 command"""
         answer = magic8()
-        return await self.send_response(message, answer)
+        
+        # Format response with sender mention for channel messages, without for DMs
+        if message.is_dm:
+            response = f"🎱 {answer}"
+        else:
+            sender = message.sender_id or "Unknown"
+            response = f"🎱 @[{sender}] {answer}"
+        
+        return await self.send_response(message, response)
+