diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 68cc3a12..f9579622 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -13,6 +13,12 @@ class RegistrationsController < Devise::RegistrationsController
 
   private
 
+  def require_no_authentication
+    super
+
+    flash.clear
+  end
+
   def build_resource(_hash = {})
     account = Account.new(account_params)
     account.timezone = Accounts.normalize_timezone(account.timezone)
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index f899f160..28878ba5 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -9,4 +9,12 @@ class SessionsController < Devise::SessionsController
 
     super
   end
+
+  private
+
+  def require_no_authentication
+    super
+
+    flash.clear
+  end
 end