diff --git a/pkg/api/folder_permission.go b/pkg/api/folder_permission.go
index 12afa5e1375..920fb9f33b7 100644
--- a/pkg/api/folder_permission.go
+++ b/pkg/api/folder_permission.go
@@ -45,6 +45,7 @@ func (hs *HTTPServer) GetFolderPermissionList(c *contextmodel.ReqContext) respon
 			continue
 		}
 
+		// nolint:staticcheck
 		perm.FolderID = folder.ID
 		perm.DashboardID = 0
 
diff --git a/pkg/services/dashboards/models.go b/pkg/services/dashboards/models.go
index ec2561524d9..ec75d6bcb9a 100644
--- a/pkg/services/dashboards/models.go
+++ b/pkg/services/dashboards/models.go
@@ -428,10 +428,11 @@ type DashboardACL struct {
 func (p DashboardACL) TableName() string { return "dashboard_acl" }
 
 type DashboardACLInfoDTO struct {
-	OrgID       int64  `json:"-" xorm:"org_id"`
-	DashboardID int64  `json:"dashboardId,omitempty" xorm:"dashboard_id"`
-	FolderID    int64  `json:"folderId,omitempty" xorm:"folder_id"`
-	FolderUID   string `json:"folderUid,omitempty" xorm:"folder_uid"`
+	OrgID       int64 `json:"-" xorm:"org_id"`
+	DashboardID int64 `json:"dashboardId,omitempty" xorm:"dashboard_id"`
+	// Deprecated: use FolderUID instead
+	FolderID  int64  `json:"folderId,omitempty" xorm:"folder_id"`
+	FolderUID string `json:"folderUid,omitempty" xorm:"folder_uid"`
 
 	Created time.Time `json:"created"`
 	Updated time.Time `json:"updated"`
diff --git a/public/api-merged.json b/public/api-merged.json
index 728fc4c90eb..9caf23cecae 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -13111,6 +13111,7 @@
           "format": "int64"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
diff --git a/public/openapi3.json b/public/openapi3.json
index dddc763c964..fdee5209561 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -4184,6 +4184,7 @@
             "type": "integer"
           },
           "folderId": {
+            "description": "Deprecated: use FolderUID instead",
             "format": "int64",
             "type": "integer"
           },