diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b15157f7..bd7b8c4b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,10 +12,6 @@ class ApplicationController < ActionController::Base
   before_action :notify_unconfirmed_email, unless: :devise_controller?
   around_action :set_locale
 
-  rescue_from Pundit::NilPolicyError, with: :page_not_found
-  rescue_from ActionController::RoutingError, with: :page_not_found
-  rescue_from ActionController::ParameterMissing, with: :page_not_found
-
   before_action do
     Rack::MiniProfiler.authorize_request if current_usuarie&.email&.ends_with?('@' + ENV.fetch('SUTTY', 'sutty.nl'))
   end
@@ -75,18 +71,6 @@ class ApplicationController < ActionController::Base
     I18n.with_locale(current_locale, &action)
   end
 
-  # Muestra una página 404
-  #
-  # @see {https://github.com/rails/rails/issues/25106}
-  def page_not_found
-    self.response_body = nil
-    @_response_body = nil
-
-    headers.delete('Location')
-
-    render 'application/page_not_found', status: :not_found
-  end
-
   # Necesario para poder acceder a Blazer.  Solo les usuaries de este
   # sitio pueden acceder al panel.
   def require_usuarie
diff --git a/app/controllers/concerns/exception_handler.rb b/app/controllers/concerns/exception_handler.rb
index 8c4f54c8..7c1cd540 100644
--- a/app/controllers/concerns/exception_handler.rb
+++ b/app/controllers/concerns/exception_handler.rb
@@ -12,13 +12,31 @@ module ExceptionHandler
     rescue_from PageNotFound, with: :page_not_found
     rescue_from ActionController::RoutingError, with: :page_not_found
     rescue_from Pundit::NilPolicyError, with: :page_not_found
+    rescue_from Pundit::NilPolicyError, with: :page_not_found
+    rescue_from ActionController::RoutingError, with: :page_not_found
+    rescue_from ActionController::ParameterMissing, with: :page_not_found
   end
 
   def site_not_found
+    reset_response!
+
+    flash[:error] = I18n.t('errors.site_not_found')
+
     redirect_to sites_path
   end
 
   def page_not_found
-    send_file Rails.root.join('public', '404.html')
+    reset_response!
+
+    render 'application/page_not_found', status: :not_found
+  end
+
+  private
+
+  def reset_response!
+    self.response_body = nil
+    @_response_body = nil
+
+    headers.delete('Location')
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1c15708b..49aecf7d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -386,6 +386,7 @@ en:
             lang:
               not_available: "This language is not yet available, would you help us by translating Sutty into it?"
   errors:
+    site_not_found: "Site not found, or maybe you don't have access to it."
     argument_error: 'Argument `%{argument}` must be an instance of %{class}'
     unknown_locale: 'Unknown %{locale} locale'
     posts:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b375c414..e0cd0c65 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -385,6 +385,7 @@ es:
             lang:
               not_available: "Este idioma todavía no está disponible, ¿nos ayudas a agregarlo y mantenerlo?"
   errors:
+    site_not_found: "No encontramos ese sitio o quizás no tengas acceso."
     argument_error: 'El argumento `%{argument}` debe ser una instancia de %{class}'
     unknown_locale: 'El idioma %{locale} es desconocido'
     posts: