diff --git a/app/models/setting.rb b/app/models/setting.rb
index c00152a..1d895b2 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -209,6 +209,6 @@ class Setting < RailsSettings::Base
 
   def self.default_services
     # TODO Make configurable from respective service settings page
-    %w[ discourse gitea mediawiki xmpp ]
+    %w[ discourse gitea mastodon mediawiki xmpp ]
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 249ac61..6e7300d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -147,7 +147,7 @@ RSpec.describe User, type: :model do
     after { clear_enqueued_jobs }
 
     it "enables default services" do
-      expect(user).to receive(:enable_service).with(%w[ discourse gitea mediawiki xmpp ])
+      expect(user).to receive(:enable_service).with(%w[ discourse gitea mastodon mediawiki xmpp ])
       user.send :devise_after_confirmation
     end