diff --git a/go/common/feature_flags.go b/go/common/feature_flags.go
index 617c156bc6..a2a448d8ab 100644
--- a/go/common/feature_flags.go
+++ b/go/common/feature_flags.go
@@ -12,6 +12,7 @@ func ParseFeatureFlags(flags string, defaults map[string]bool) map[string]bool {
 		settings[k] = v
 	}
 	for _, flagName := range strings.Split(flags, ",") {
+		flagName = strings.TrimSpace(flagName)
 		var flagValue = true
 		if strings.HasPrefix(flagName, "no_") {
 			flagName = strings.TrimPrefix(flagName, "no_")