diff --git a/extensions/subscriptions/extend.php b/extensions/subscriptions/extend.php
index 8bb29b5440..f563b6b81f 100644
--- a/extensions/subscriptions/extend.php
+++ b/extensions/subscriptions/extend.php
@@ -10,6 +10,7 @@
 use Flarum\Api\Resource;
 use Flarum\Approval\Event\PostWasApproved;
 use Flarum\Discussion\Event\Saving;
+use Flarum\Discussion\Event\Started;
 use Flarum\Discussion\Search\DiscussionSearcher;
 use Flarum\Discussion\UserState;
 use Flarum\Extend;
@@ -60,7 +61,8 @@
         ->listen(Hidden::class, Listener\DeleteNotificationWhenPostIsHiddenOrDeleted::class)
         ->listen(Restored::class, Listener\RestoreNotificationWhenPostIsRestored::class)
         ->listen(Deleted::class, Listener\DeleteNotificationWhenPostIsHiddenOrDeleted::class)
-        ->listen(Posted::class, Listener\FollowAfterReply::class),
+        ->listen(Posted::class, Listener\FollowAfterReply::class)
+        ->listen(Started::class, Listener\FollowAfterCreate::class),
 
     (new Extend\SearchDriver(DatabaseSearchDriver::class))
         ->addFilter(DiscussionSearcher::class, SubscriptionFilter::class)
@@ -68,5 +70,6 @@
 
     (new Extend\User())
         ->registerPreference('followAfterReply', 'boolval', false)
+        ->registerPreference('followAfterCreate', 'boolval', false)
         ->registerPreference('flarum-subscriptions.notify_for_all_posts', 'boolval', false),
 ];
diff --git a/extensions/subscriptions/js/src/@types/shims.d.ts b/extensions/subscriptions/js/src/@types/shims.d.ts
index 057f872464..c166382259 100644
--- a/extensions/subscriptions/js/src/@types/shims.d.ts
+++ b/extensions/subscriptions/js/src/@types/shims.d.ts
@@ -1,7 +1,16 @@
 import 'flarum/common/models/Discussion';
+import 'flarum/forum/components/SettingsPage';
 
 declare module 'flarum/common/models/Discussion' {
   export default interface Discussion {
     subscription(): string;
   }
 }
+
+declare module 'flarum/forum/components/SettingsPage' {
+  export default interface SettingsPage {
+    followAfterReplyLoading: boolean;
+    followAfterCreateLoading: boolean;
+    notifyForAllPostsLoading: boolean;
+  }
+}
diff --git a/extensions/subscriptions/js/src/forum/addSubscriptionSettings.tsx b/extensions/subscriptions/js/src/forum/addSubscriptionSettings.tsx
index e5cd93f790..5dc59df832 100644
--- a/extensions/subscriptions/js/src/forum/addSubscriptionSettings.tsx
+++ b/extensions/subscriptions/js/src/forum/addSubscriptionSettings.tsx
@@ -8,7 +8,7 @@ export default function () {
     items.add(
       'followAfterReply',
       <Switch
-        state={this.user!.preferences()?.followAfterReply}
+        state={!!this.user?.preferences()?.followAfterReply}
         onchange={(value: boolean) => {
           this.followAfterReplyLoading = true;
 
@@ -23,6 +23,24 @@ export default function () {
       </Switch>
     );
 
+    items.add(
+      'followAfterCreate',
+      <Switch
+        state={!!this.user?.preferences()?.followAfterCreate}
+        onchange={(value: boolean) => {
+          this.followAfterCreateLoading = true;
+
+          this.user!.savePreferences({ followAfterCreate: value }).then(() => {
+            this.followAfterCreateLoading = false;
+            m.redraw();
+          });
+        }}
+        loading={this.followAfterCreateLoading}
+      >
+        {app.translator.trans('flarum-subscriptions.forum.settings.follow_after_create_label')}
+      </Switch>
+    );
+
     items.add(
       'notifyForAllPosts',
       <Switch
diff --git a/extensions/subscriptions/locale/en.yml b/extensions/subscriptions/locale/en.yml
index f19f637462..5615582f16 100644
--- a/extensions/subscriptions/locale/en.yml
+++ b/extensions/subscriptions/locale/en.yml
@@ -31,6 +31,7 @@ flarum-subscriptions:
     # These translations are used in the Settings page.
     settings:
       follow_after_reply_label: Automatically follow discussions that I reply to
+      follow_after_create_label: Automatically follow discussions that I create
       notify_for_all_posts_label: Notify about every new post instead of only the last in a discussion
       notify_new_post_label: Someone posts in a discussion I'm following
 
diff --git a/extensions/subscriptions/src/Listener/FollowAfterCreate.php b/extensions/subscriptions/src/Listener/FollowAfterCreate.php
new file mode 100644
index 0000000000..6e5c94facb
--- /dev/null
+++ b/extensions/subscriptions/src/Listener/FollowAfterCreate.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Subscriptions\Listener;
+
+use Flarum\Discussion\Event\Started;
+
+class FollowAfterCreate
+{
+    public function handle(Started $event): void
+    {
+        $actor = $event->actor;
+
+        if ($actor && $actor->exists && $actor->getPreference('followAfterCreate')) {
+            $actor->assertRegistered();
+
+            $state = $event->discussion->stateFor($actor);
+
+            $state->subscription = 'follow';
+            $state->save();
+        }
+    }
+}
diff --git a/extensions/subscriptions/tests/integration/api/discussions/FollowAfterCreateTest.php b/extensions/subscriptions/tests/integration/api/discussions/FollowAfterCreateTest.php
new file mode 100644
index 0000000000..f88d7deff0
--- /dev/null
+++ b/extensions/subscriptions/tests/integration/api/discussions/FollowAfterCreateTest.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Subscriptions\Tests\integration\api\discussions;
+
+use Flarum\Testing\integration\RetrievesAuthorizedUsers;
+use Flarum\Testing\integration\TestCase;
+use Flarum\User\User;
+use PHPUnit\Framework\Attributes\Test;
+
+class FollowAfterCreateTest extends TestCase
+{
+    use RetrievesAuthorizedUsers;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->extension('flarum-subscriptions');
+
+        $this->prepareDatabase([
+            User::class => [
+                $this->normalUser(),
+                ['id' => 3, 'username' => 'acme_follow', 'email' => 'acme@machine.local', 'is_email_confirmed' => 1, 'preferences' => json_encode(['followAfterCreate' => true])],
+                ['id' => 4, 'username' => 'acme_no_follow', 'email' => 'acme2@machine.local', 'is_email_confirmed' => 1, 'preferences' => json_encode(['followAfterCreate' => false])],
+            ],
+        ]);
+    }
+
+    #[Test]
+    public function user_with_preference_true_follows_after_creating_discussion()
+    {
+        $this->app();
+
+        $response = $this->send(
+            $this->request('POST', '/api/discussions', [
+                'authenticatedAs' => 3,
+                'json' => [
+                    'data' => [
+                        'type' => 'discussions',
+                        'attributes' => [
+                            'title' => 'Test Discussion',
+                            'content' => 'Test content that needs to be sufficiently long.'
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        $this->assertEquals(201, $response->getStatusCode());
+
+        $discussionId = json_decode($response->getBody()->getContents(), true)['data']['id'];
+
+        $this->assertEquals('follow', $this->database()->table('discussion_user')->where('discussion_id', $discussionId)->where('user_id', 3)->value('subscription'));
+    }
+
+    #[Test]
+    public function user_with_preference_false_does_not_follow_after_creating_discussion()
+    {
+        $this->app();
+
+        $response = $this->send(
+            $this->request('POST', '/api/discussions', [
+                'authenticatedAs' => 4,
+                'json' => [
+                    'data' => [
+                        'type' => 'discussions',
+                        'attributes' => [
+                            'title' => 'Test Discussion',
+                            'content' => 'Test content that needs to be sufficiently long.'
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        $this->assertEquals(201, $response->getStatusCode());
+
+        $discussionId = json_decode($response->getBody()->getContents(), true)['data']['id'];
+
+        $this->assertNull($this->database()->table('discussion_user')->where('discussion_id', $discussionId)->where('user_id', 4)->value('subscription'));
+    }
+}
diff --git a/extensions/subscriptions/tests/integration/api/discussions/FollowAfterReplyTest.php b/extensions/subscriptions/tests/integration/api/discussions/FollowAfterReplyTest.php
new file mode 100644
index 0000000000..e15902a01c
--- /dev/null
+++ b/extensions/subscriptions/tests/integration/api/discussions/FollowAfterReplyTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Subscriptions\Tests\integration\api\discussions;
+
+use Carbon\Carbon;
+use Flarum\Discussion\Discussion;
+use Flarum\Post\Post;
+use Flarum\Testing\integration\RetrievesAuthorizedUsers;
+use Flarum\Testing\integration\TestCase;
+use Flarum\User\User;
+use PHPUnit\Framework\Attributes\Test;
+
+class FollowAfterReplyTest extends TestCase
+{
+    use RetrievesAuthorizedUsers;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->extension('flarum-subscriptions');
+
+        $this->prepareDatabase([
+            User::class => [
+                $this->normalUser(),
+                ['id' => 3, 'username' => 'acme_follow', 'email' => 'acme@machine.local', 'is_email_confirmed' => 1, 'preferences' => json_encode(['followAfterReply' => true])],
+                ['id' => 4, 'username' => 'acme_no_follow', 'email' => 'acme2@machine.local', 'is_email_confirmed' => 1, 'preferences' => json_encode(['followAfterReply' => false])],
+            ],
+            Discussion::class => [
+                ['id' => 1, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 1, 'first_post_id' => 1, 'comment_count' => 1, 'last_post_number' => 1, 'last_post_id' => 1],
+            ],
+            Post::class => [
+                ['id' => 1, 'discussion_id' => 1, 'created_at' => Carbon::createFromDate(1975, 5, 21)->toDateTimeString(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>foo bar</p></t>', 'number' => 1],
+            ],
+        ]);
+    }
+
+    #[Test]
+    public function user_with_preference_true_follows_after_replying_to_discussion()
+    {
+        $this->app();
+
+        $response = $this->send(
+            $this->request('POST', '/api/posts', [
+                'authenticatedAs' => 3,
+                'json' => [
+                    'data' => [
+                        'type' => 'posts',
+                        'attributes' => [
+                            'content' => 'reply with predetermined content for automated testing'
+                        ],
+                        'relationships' => [
+                            'discussion' => ['data' => ['id' => 1]],
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        $this->assertEquals(201, $response->getStatusCode());
+
+        $this->assertEquals('follow', $this->database()->table('discussion_user')->where('discussion_id', 1)->where('user_id', 3)->value('subscription'));
+    }
+
+    #[Test]
+    public function user_with_preference_false_does_not_follow_after_replying_to_discussion()
+    {
+        $this->app();
+
+        $response = $this->send(
+            $this->request('POST', '/api/posts', [
+                'authenticatedAs' => 4,
+                'json' => [
+                    'data' => [
+                        'type' => 'posts',
+                        'attributes' => [
+                            'content' => 'reply with predetermined content for automated testing'
+                        ],
+                        'relationships' => [
+                            'discussion' => ['data' => ['id' => 1]],
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        $this->assertEquals(201, $response->getStatusCode());
+
+        $this->assertNull($this->database()->table('discussion_user')->where('discussion_id', 1)->where('user_id', 4)->value('subscription'));
+    }
+}