1 files changed, 8 insertions, 1 deletions
diff --git a/jstests/libs/columnstore_util.js b/jstests/libs/columnstore_util.js
index ba2c684da1c..3247e7fcb1f 100644
--- a/jstests/libs/columnstore_util.js
+++ b/jstests/libs/columnstore_util.js
@@ -58,7 +58,14 @@ function safeToCreateColumnStoreIndexInCluster(nodes) {
             return false;
         }
 
-        break;
+        const getParamFeatureFlagRes = assert.commandWorked(
+            conn.adminCommand({getParameter: 1, featureFlagColumnstoreIndexes: 1}));
+        if (!getParamFeatureFlagRes.featureFlagColumnstoreIndexes ||
+            !getParamFeatureFlagRes.featureFlagColumnstoreIndexes["value"]) {
+            jsTestLog("Note: declining to create column store index, because " +
+                      "featureFlagColumnstoreIndexes is disabled");
+            return false;
+        }
     }
 
     return true;