diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index bd662ab159..24797d6b8f 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -154,6 +154,7 @@ class ListController < ApplicationController
     when :private_messages_group, :private_messages_group_archive
       define_method("#{action}") do
         group = Group.find_by(name: params[:group_name])
+        raise Discourse::NotFound if !group
         raise Discourse::NotFound unless guardian.can_see_group_messages?(group)
 
         message_route(action)