diff --git a/pkg/registry/apis/datasource/register.go b/pkg/registry/apis/datasource/register.go
index 78eb77f7fdf..7b23c24655a 100644
--- a/pkg/registry/apis/datasource/register.go
+++ b/pkg/registry/apis/datasource/register.go
@@ -128,8 +128,7 @@ func RegisterAPIService(
 
 		// Hardcoded schemas for testdata
 		// NOTE: this will be driven by the pluginJSON/manifest soon
-		if pluginJSON.ID == "grafana-testdata-datasource" &&
-			features.IsEnabledGlobally(featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs) {
+		if pluginJSON.ID == "grafana-testdata-datasource" && configCrudUseNewApis {
 			builder.schemaProvider = hardcoded.TestdataOpenAPIExtension
 		}