diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 27e9b8e5a..e432bea99 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,6 +21,7 @@ def authenticate_admin_user!
   end
 
   def check_for_first_use
+    authenticate_user! if User.count == 0
     redirect_to(edit_user_registration_path) if current_user&.reset_password_token == "first_use"
   end
 
diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb
index 23a9e6ff7..31847c771 100644
--- a/app/controllers/health_controller.rb
+++ b/app/controllers/health_controller.rb
@@ -2,6 +2,7 @@
 
 class HealthController < ApplicationController
   after_action :verify_policy_scoped, except: :index
+  skip_before_action :check_for_first_use
 
   def index
     render json: {status: "OK"}, status: :ok