diff --git a/src/snek/service/channel_message.py b/src/snek/service/channel_message.py
index 0e5da92..a8dbc55 100644
--- a/src/snek/service/channel_message.py
+++ b/src/snek/service/channel_message.py
@@ -69,10 +69,9 @@ class ChannelMessageService(BaseService):
                 "color": user["color"],
             }
         )
-        context['message'] = whitelist_attributes(context['message'])
         try:
             template = self.app.jinja2_env.get_template("message.html")
-            model["html"] = template.render(**context)
+            model["html"] = whitelist_attributes(template.render(**context))
         except Exception as ex:
             print(ex, flush=True)
 
@@ -118,7 +117,6 @@ class ChannelMessageService(BaseService):
     async def save(self, model):
         context = {}
         context.update(model.record)
-        context['message'] = whitelist_attributes(context['message'])
         user = await self.app.services.user.get(model["user_uid"])
         context.update(
             {
@@ -129,7 +127,7 @@ class ChannelMessageService(BaseService):
             }
         )
         template = self.app.jinja2_env.get_template("message.html")
-        model["html"] = template.render(**context)
+        model["html"] = whitelist_attributes(template.render(**context))
         return await super().save(model)
 
     async def offset(self, channel_uid, page=0, timestamp=None, page_size=30):