diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index 504d0cfd5c6..937997112b1 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -63,7 +63,7 @@ Some features are enabled by default. You can disable these feature by setting t
 | `disableAngular`                 | Dynamic flag to disable angular at runtime. The preferred method is to set `angular_support_enabled` to `false` in the [security] settings, which allows you to change the state at runtime. |
 | `grpcServer`                     | Run the GRPC server                                                                                                                                                                          |
 | `accessControlOnCall`            | Access control primitives for OnCall                                                                                                                                                         |
-| `nestedFolders`                  | Enable folder nesting                                                                                                                                                                        |
+| `nestedFolders`                  | Enable folder nesting for dashboards and alerts. Note that managed alert rules aren't supported for nested folders. This feature is only supported for test and development environments.    |
 | `alertingNoNormalState`          | Stop maintaining state of alerts that are not firing                                                                                                                                         |
 | `renderAuthJWT`                  | Uses JWT-based auth for rendering instead of relying on remote cache                                                                                                                         |
 | `refactorVariablesTimeRange`     | Refactor time range variables flow to reduce number of API calls made when query variables are chained                                                                                       |
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index b97378cfe32..6c139acc052 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -289,7 +289,7 @@ var (
 		},
 		{
 			Name:        "nestedFolders",
-			Description: "Enable folder nesting",
+			Description: "Enable folder nesting for dashboards and alerts. Note that managed alert rules aren't supported for nested folders. This feature is only supported for test and development environments.",
 			Stage:       FeatureStagePublicPreview,
 			Owner:       grafanaBackendPlatformSquad,
 			Created:     time.Date(2022, time.October, 22, 12, 0, 0, 0, time.UTC),
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index d70f99c90dc..9b407264944 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -140,7 +140,7 @@ const (
 	FlagAccessControlOnCall = "accessControlOnCall"
 
 	// FlagNestedFolders
-	// Enable folder nesting
+	// Enable folder nesting for dashboards and alerts. Note that managed alert rules aren't supported for nested folders. This feature is only supported for test and development environments.
 	FlagNestedFolders = "nestedFolders"
 
 	// FlagNestedFolderPicker