diff --git a/api/src/org/labkey/api/data/Container.java b/api/src/org/labkey/api/data/Container.java
index 620e84567c5..b1f2bbe0c54 100644
--- a/api/src/org/labkey/api/data/Container.java
+++ b/api/src/org/labkey/api/data/Container.java
@@ -1035,12 +1035,14 @@ public FolderType getFolderType()
     public Boolean getAuditCommentsRequired()
     {
         Map<String, String> props = PropertyManager.getProperties(this, AUDIT_SETTINGS_PROPERTY_SET_NAME);
+        if (!AdminConsole.isProductFeatureEnabled(ProductFeature.DataChangeCommentRequirement))
+            return false;
         return Boolean.parseBoolean(props.getOrDefault(REQUIRE_USER_COMMENTS_PROPERTY_NAME, "false"));
     }
 
     /**
      * Sets the default module for a "mixed" type folder. We try not to create
-     * these any more. Instead each folder is "owned" by a module
+     * these anymore. Instead, each folder is "owned" by a module
      */
     public void setDefaultModule(Module module)
     {