From ec9b18ec4ec68836152eb0a482b663ba996da8ad Mon Sep 17 00:00:00 2001
From: Erwin Pe <erwin.pe@mongodb.com>
Date: Mon, 28 Jul 2025 17:17:57 -0400
Subject: [PATCH] SERVER-107730 Move FLE2 tag limits check in createCollection
 under FCV check (#39210)

GitOrigin-RevId: 743d5f5e32793390a0821a12391b56e2510aecc0
---
 src/mongo/db/commands/create_command.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mongo/db/commands/create_command.cpp b/src/mongo/db/commands/create_command.cpp
index ef7866bf3ab..8ce8342e251 100644
--- a/src/mongo/db/commands/create_command.cpp
+++ b/src/mongo/db/commands/create_command.cpp
@@ -398,9 +398,10 @@ public:
                             "Cannot create a collection with a strEncodeVersion set unless "
                             "featureFlagQETextSearchPreview is enabled",
                             !cmd.getEncryptedFields()->getStrEncodeVersion());
+                } else {
+                    EncryptionInformationHelpers::checkTagLimitsAndStorageNotExceeded(
+                        cmd.getEncryptedFields().get());
                 }
-                EncryptionInformationHelpers::checkTagLimitsAndStorageNotExceeded(
-                    cmd.getEncryptedFields().get());
             }
 
             if (auto timeseries = cmd.getTimeseries()) {