diff --git a/PluralKit.API/Controllers/v1/MessageController.cs b/PluralKit.API/Controllers/v1/MessageController.cs
index 9e51e57a..00cfd443 100644
--- a/PluralKit.API/Controllers/v1/MessageController.cs
+++ b/PluralKit.API/Controllers/v1/MessageController.cs
@@ -26,6 +26,7 @@ public class MessageController: ControllerBase
         var msg = await _db.Execute(c => _repo.GetMessage(c, mid));
         if (msg == null) return NotFound("Message not found.");
 
-        return msg.ToJson(User.ContextFor(msg.System), APIVersion.V1);
+        var ctx = msg.System == null ? LookupContext.ByNonOwner : User.ContextFor(msg.System);
+        return msg.ToJson(ctx, APIVersion.V1);
     }
 }
\ No newline at end of file