diff --git a/shortcodes/MastodonShortcode.php b/shortcodes/MastodonShortcode.php
index e160634..b3c8a57 100644
--- a/shortcodes/MastodonShortcode.php
+++ b/shortcodes/MastodonShortcode.php
@@ -171,6 +171,15 @@ protected function getData($url)
                     '<img src="' . $this->fetchImage($emoji['url']) . '" alt="' . $emoji['shortcode'] . '" class="sse-mastodon-custom-emoji" />',
                     $toot['content']
                 );
+
+                if (isset($toot['spoiler_text']))
+                {
+                    $toot['spoiler_text'] = str_replace(
+                        ':' . $emoji['shortcode'] . ':',
+                        '<img src="' . $this->fetchImage($emoji['url']) . '" alt="' . $emoji['shortcode'] . '" class="sse-mastodon-custom-emoji" />',
+                        $toot['spoiler_text']
+                    );
+                }
             }
         }