diff --git a/client/js/util/misc.js b/client/js/util/misc.js
index 56c20437..68af2d8f 100644
--- a/client/js/util/misc.js
+++ b/client/js/util/misc.js
@@ -123,7 +123,7 @@ function formatMarkdown(text) {
         text = text.replace(/%%%#/g, '#');
 
         text = text.replace(
-            /%%%SJIS(\d+)/,
+            /(?:<p>)?%%%SJIS(\d+)(?:<\/p>)?/,
             (match, capture) => {
                 return '<div class="sjis">' + sjis[capture] + '</div>';
             });