diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix
index 075781583c00..1fd46f19abfa 100644
--- a/nixos/tests/mattermost/default.nix
+++ b/nixos/tests/mattermost/default.nix
@@ -66,12 +66,7 @@ import ../make-test-python.nix (
 
             # Upgrade to the latest Mattermost.
             specialisation.latest.configuration = {
-              services.mattermost.package = lib.mkForce (
-                pkgs.mattermostLatest.override {
-                  removeFreeBadge = true;
-                  removeUserLimit = true;
-                }
-              );
+              services.mattermost.package = lib.mkForce pkgs.mattermostLatest;
               system.stateVersion = lib.mkVMOverride (lib.versions.majorMinor lib.version);
             };
           }
diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index d241c440c42a..077e35239ed7 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -35,6 +35,11 @@
   ...
 }:
 
+assert lib.warnIf (latestVersionInfo != null && (removeUserLimit || removeFreeBadge)) ''
+  The user limit and free badge patches are not tested with this Mattermost version
+  (${latestVersionInfo.version}).
+'' true;
+
 let
   /*
     Helper function that sets the `withTests` and `withoutTests` passthru correctly,