diff --git a/extensions/emoji/src/Listener/AddClientAssets.php b/extensions/emoji/src/Listener/AddClientAssets.php
index 8d4d69036..52aabd3ed 100644
--- a/extensions/emoji/src/Listener/AddClientAssets.php
+++ b/extensions/emoji/src/Listener/AddClientAssets.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Emoji\Listener;
 
-use Flarum\Event\ConfigureWebApp;
+use Flarum\Frontend\Event\Rendering;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class AddClientAssets
@@ -21,13 +21,13 @@ class AddClientAssets
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(ConfigureWebApp::class, [$this, 'addAssets']);
+        $events->listen(Rendering::class, [$this, 'addAssets']);
     }
 
     /**
-     * @param ConfigureClientView $event
+     * @param Rendering $event
      */
-    public function addAssets(ConfigureWebApp $event)
+    public function addAssets(Rendering $event)
     {
         if ($event->isForum()) {
             $event->addAssets([
diff --git a/extensions/emoji/src/Listener/FormatEmoticons.php b/extensions/emoji/src/Listener/FormatEmoticons.php
index ea652c3a1..393e93843 100644
--- a/extensions/emoji/src/Listener/FormatEmoticons.php
+++ b/extensions/emoji/src/Listener/FormatEmoticons.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Emoji\Listener;
 
-use Flarum\Event\ConfigureFormatter;
+use Flarum\Formatter\Event\Configuring;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class FormatEmoticons
@@ -21,13 +21,13 @@ class FormatEmoticons
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(ConfigureFormatter::class, [$this, 'addEmoticons']);
+        $events->listen(Configuring::class, [$this, 'addEmoticons']);
     }
 
     /**
-     * @param ConfigureFormatter $event
+     * @param Configuring $event
      */
-    public function addEmoticons(ConfigureFormatter $event)
+    public function addEmoticons(Configuring $event)
     {
         $event->configurator->Emoji->useEmojiOne();
         $event->configurator->Emoji->omitImageSize();