diff --git a/pkg/services/sqlstore/migrations/dashboard_public_mig.go b/pkg/services/sqlstore/migrations/dashboard_public_mig.go
index 1dfc3512018e..abbdd1367511 100644
--- a/pkg/services/sqlstore/migrations/dashboard_public_mig.go
+++ b/pkg/services/sqlstore/migrations/dashboard_public_mig.go
@@ -74,4 +74,7 @@ func addPublicDashboardMigration(mg *Migrator) {
 		Nullable: false,
 		Default:  "0",
 	}))
+
+	mg.AddMigration("delete orphaned public dashboards", NewRawSQLMigration(
+		"DELETE FROM dashboard_public WHERE dashboard_uid NOT IN (SELECT uid FROM dashboard)"))
 }