diff --git a/pkg/services/sqlstore/migrations/dashboard_mig.go b/pkg/services/sqlstore/migrations/dashboard_mig.go
index 1035ef35015..7da7c5a974f 100644
--- a/pkg/services/sqlstore/migrations/dashboard_mig.go
+++ b/pkg/services/sqlstore/migrations/dashboard_mig.go
@@ -151,17 +151,16 @@ func addDashboardMigration(mg *Migrator) {
 		Name: "has_acl", Type: DB_Bool, Nullable: false, Default: "0",
 	}))
 
-	// new uid column
 	mg.AddMigration("Add column uid in dashboard", NewAddColumnMigration(dashboardV2, &Column{
-		Name: "uid", Type: DB_NVarchar, Length: 12, Nullable: true,
+		Name: "uid", Type: DB_NVarchar, Length: 40, Nullable: true,
 	}))
 
-	mg.AddMigration("Set uid column values", new(RawSqlMigration).
+	mg.AddMigration("Update uid column values in dashboard", new(RawSqlMigration).
 		Sqlite("UPDATE dashboard SET uid=printf('%09d',id) WHERE uid IS NULL;").
 		Postgres("UPDATE dashboard SET uid=lpad('' || id,9,'0') WHERE uid IS NULL;").
 		Mysql("UPDATE dashboard SET uid=lpad(id,9,'0') WHERE uid IS NULL;"))
 
-	mg.AddMigration("Add index for uid in dashboard", NewAddIndexMigration(dashboardV2, &Index{
-		Cols: []string{"uid"}, Type: UniqueIndex,
+	mg.AddMigration("Add unique index dashboard_org_id_uid", NewAddIndexMigration(dashboardV2, &Index{
+		Cols: []string{"org_id", "uid"}, Type: UniqueIndex,
 	}))
 }