diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md
index 403ec05d..4dc69c95 100644
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@@ -729,7 +729,7 @@ into 7 groups of 6 bits, similar to how one would base64 encode
 something. Convert each group of 6 bits to a number and use the
 following table to get the corresponding emoji:
 
-{{sas\_emoji\_table}}
+{{% sas-emojis %}}
 
 {{% boxes/note %}}
 This table is available as JSON at
diff --git a/layouts/shortcodes/sas-emojis.html b/layouts/shortcodes/sas-emojis.html
new file mode 100644
index 00000000..5ce6a009
--- /dev/null
+++ b/layouts/shortcodes/sas-emojis.html
@@ -0,0 +1,26 @@
+{{/*
+
+  This template is used to render the table of SAS emoji table.
+
+  It replaces the old {{sas_emoji_table}} template.
+
+*/}}
+
+{{ $emoji_json := readFile "data-definitions/sas-emoji.json" | transform.Unmarshal }}
+
+<table>
+  <tr>
+    <th>Number</th>
+    <th>Emoji</th>
+    <th>Unicode</th>
+    <th>Description</th>
+  </tr>
+{{ range $emoji_json }}
+  <tr>
+    <td>{{ .number }}</td>
+    <td>{{ .emoji }}</td>
+    <td>{{ .unicode }}</td>
+    <td>{{ .description }}</td>
+  </tr>
+{{ end }}
+</table>