diff --git a/extensions/messages/js/src/admin/extend.ts b/extensions/messages/js/src/admin/extend.ts
index f3e3a9c00..68419e34d 100644
--- a/extensions/messages/js/src/admin/extend.ts
+++ b/extensions/messages/js/src/admin/extend.ts
@@ -1,8 +1,18 @@
 import Extend from 'flarum/common/extenders';
 import commonExtend from '../common/extend';
+import app from '@flarum/core/dist-typings/admin/app';
 
 export default [
   ...commonExtend,
 
-  // Add your admin extenders here
+  new Extend.Admin().permission(
+    () => ({
+      icon: 'fas fa-envelope-open-text',
+      label: app.translator.trans('flarum-messages.admin.permissions.send_messages'),
+      permission: 'dialog.sendMessage',
+      allowGuest: false,
+    }),
+    'start',
+    98
+  ),
 ];
diff --git a/extensions/messages/js/src/admin/index.ts b/extensions/messages/js/src/admin/index.ts
index bd8bc3864..bbd02dd73 100644
--- a/extensions/messages/js/src/admin/index.ts
+++ b/extensions/messages/js/src/admin/index.ts
@@ -3,14 +3,5 @@ import app from 'flarum/admin/app';
 export { default as extend } from './extend';
 
 app.initializers.add('flarum-messages', () => {
-  app.extensionData.for('flarum-messages').registerPermission(
-    {
-      icon: 'fas fa-envelope-open-text',
-      label: app.translator.trans('flarum-messages.admin.permissions.send_messages'),
-      permission: 'dialog.sendMessage',
-      allowGuest: false,
-    },
-    'start',
-    98
-  );
+  //
 });
diff --git a/extensions/messages/js/src/forum/components/MessageStream.tsx b/extensions/messages/js/src/forum/components/MessageStream.tsx
index a5ea07fb0..00539e34b 100644
--- a/extensions/messages/js/src/forum/components/MessageStream.tsx
+++ b/extensions/messages/js/src/forum/components/MessageStream.tsx
@@ -161,8 +161,8 @@ export default class MessageStream<CustomAttrs extends IDialogStreamAttrs = IDia
     if (lastTime && dt > 1000 * 60 * 60 * 24 * 4) {
       return (
         <div className="PostStream-timeGap">
-          {/* @ts-ignore */}
           <span>
+            {/* @ts-ignore */}
             {app.translator.trans('flarum-messages.forum.messages_page.stream.time_lapsed_text', { period: dayjs().add(dt, 'ms').fromNow(true) })}
           </span>
         </div>
diff --git a/extensions/tags/js/src/admin/addTagsPermissionScope.tsx b/extensions/tags/js/src/admin/addTagsPermissionScope.tsx
index 71ec88f33..1cdb1c46b 100644
--- a/extensions/tags/js/src/admin/addTagsPermissionScope.tsx
+++ b/extensions/tags/js/src/admin/addTagsPermissionScope.tsx
@@ -58,7 +58,7 @@ export default function () {
             if (
               item.permission === 'viewForum' ||
               item.permission === 'startDiscussion' ||
-              (item.permission.startsWith('discussion.') && item.tagScoped !== false) ||
+              (item.permission?.startsWith('discussion.') && item.tagScoped !== false) ||
               item.tagScoped
             ) {
               return <PermissionDropdown permission={`tag${tag.id()}.${item.permission}`} allowGuest={item.allowGuest} />;