diff --git a/extensions/tags/bootstrap.php b/extensions/tags/bootstrap.php
index 89cbb63cc..44187d3bb 100644
--- a/extensions/tags/bootstrap.php
+++ b/extensions/tags/bootstrap.php
@@ -9,23 +9,32 @@
  * file that was distributed with this source code.
  */
 
+use Flarum\Extend;
 use Flarum\Tags\Access;
 use Flarum\Tags\Listener;
 use Illuminate\Contracts\Events\Dispatcher;
 
-return function (Dispatcher $events) {
-    $events->subscribe(Listener\AddClientAssets::class);
-    $events->subscribe(Listener\AddDiscussionTagsRelationship::class);
-    $events->subscribe(Listener\AddForumTagsRelationship::class);
-    $events->subscribe(Listener\AddTagsApi::class);
-    $events->subscribe(Listener\CreatePostWhenTagsAreChanged::class);
-    $events->subscribe(Listener\FilterDiscussionListByTags::class);
-    $events->subscribe(Listener\FilterPostsQueryByTag::class);
-    $events->subscribe(Listener\SaveTagsToDatabase::class);
-    $events->subscribe(Listener\UpdateTagMetadata::class);
+return [
+    (new Extend\Assets('forum'))
+        ->defaultAssets(__DIR__)
+        ->bootstrapper('flarum/tags/main'),
+    (new Extend\Assets('admin'))
+        ->defaultAssets(__DIR__)
+        ->bootstrapper('flarum/tags/main'),
+    function (Dispatcher $events) {
+        $events->subscribe(Listener\AddClientAssets::class);
+        $events->subscribe(Listener\AddDiscussionTagsRelationship::class);
+        $events->subscribe(Listener\AddForumTagsRelationship::class);
+        $events->subscribe(Listener\AddTagsApi::class);
+        $events->subscribe(Listener\CreatePostWhenTagsAreChanged::class);
+        $events->subscribe(Listener\FilterDiscussionListByTags::class);
+        $events->subscribe(Listener\FilterPostsQueryByTag::class);
+        $events->subscribe(Listener\SaveTagsToDatabase::class);
+        $events->subscribe(Listener\UpdateTagMetadata::class);
 
-    $events->subscribe(Access\GlobalPolicy::class);
-    $events->subscribe(Access\DiscussionPolicy::class);
-    $events->subscribe(Access\TagPolicy::class);
-    $events->subscribe(Access\FlagPolicy::class);
-};
+        $events->subscribe(Access\GlobalPolicy::class);
+        $events->subscribe(Access\DiscussionPolicy::class);
+        $events->subscribe(Access\TagPolicy::class);
+        $events->subscribe(Access\FlagPolicy::class);
+    },
+];
diff --git a/extensions/tags/src/Listener/AddClientAssets.php b/extensions/tags/src/Listener/AddClientAssets.php
index 3ebcfb9f5..4addd83b3 100755
--- a/extensions/tags/src/Listener/AddClientAssets.php
+++ b/extensions/tags/src/Listener/AddClientAssets.php
@@ -12,7 +12,6 @@
 namespace Flarum\Tags\Listener;
 
 use Flarum\Event\ConfigureForumRoutes;
-use Flarum\Frontend\Event\Rendering;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class AddClientAssets
@@ -22,32 +21,9 @@ class AddClientAssets
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(Rendering::class, [$this, 'addAssets']);
         $events->listen(ConfigureForumRoutes::class, [$this, 'addRoutes']);
     }
 
-    /**
-     * @param Rendering $app
-     */
-    public function addAssets(Rendering $app)
-    {
-        if ($app->isForum()) {
-            $app->addAssets([
-                __DIR__.'/../../js/forum/dist/extension.js',
-                __DIR__.'/../../less/forum/extension.less'
-            ]);
-            $app->addBootstrapper('flarum/tags/main');
-        }
-
-        if ($app->isAdmin()) {
-            $app->addAssets([
-                __DIR__.'/../../js/admin/dist/extension.js',
-                __DIR__.'/../../less/admin/extension.less'
-            ]);
-            $app->addBootstrapper('flarum/tags/main');
-        }
-    }
-
     /**
      * @param ConfigureForumRoutes $routes
      */