diff --git a/pkg/services/publicdashboards/database/database_test.go b/pkg/services/publicdashboards/database/database_test.go
index 727df3d30c5..639105a65df 100644
--- a/pkg/services/publicdashboards/database/database_test.go
+++ b/pkg/services/publicdashboards/database/database_test.go
@@ -68,8 +68,6 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
 		setup()
 
 		_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid: savedDashboard.Uid,
-			OrgId:        savedDashboard.OrgId,
 			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "abc123",
@@ -101,8 +99,6 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
 		setup()
 
 		_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid: savedDashboard.Uid,
-			OrgId:        savedDashboard.OrgId,
 			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "abc123",
@@ -125,8 +121,6 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
 		setup()
 
 		_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid: savedDashboard.Uid,
-			OrgId:        savedDashboard.OrgId,
 			PublicDashboard: PublicDashboard{
 				IsEnabled:    false,
 				Uid:          "abc123",
@@ -183,8 +177,6 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
 	t.Run("returns ErrDashboardNotFound when Dashboard not found", func(t *testing.T) {
 		setup()
 		_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid: savedDashboard.Uid,
-			OrgId:        savedDashboard.OrgId,
 			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "abc1234",
@@ -231,8 +223,6 @@ func TestIntegrationGetPublicDashboardConfig(t *testing.T) {
 		setup()
 		// insert test public dashboard
 		resp, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid: savedDashboard.Uid,
-			OrgId:        savedDashboard.OrgId,
 			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "pubdash-uid",
@@ -272,8 +262,6 @@ func TestIntegrationSavePublicDashboardConfig(t *testing.T) {
 	t.Run("saves new public dashboard", func(t *testing.T) {
 		setup()
 		resp, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid: savedDashboard.Uid,
-			OrgId:        savedDashboard.OrgId,
 			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "pubdash-uid",
@@ -323,8 +311,6 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 
 		pdUid := "asdf1234"
 		_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid: savedDashboard.Uid,
-			OrgId:        savedDashboard.OrgId,
 			PublicDashboard: PublicDashboard{
 				Uid:          pdUid,
 				DashboardUid: savedDashboard.Uid,
@@ -340,8 +326,6 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 		// inserting two different public dashboards to test update works and only affect the desired pd by uid
 		anotherPdUid := "anotherUid"
 		_, err = publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid: anotherSavedDashboard.Uid,
-			OrgId:        anotherSavedDashboard.OrgId,
 			PublicDashboard: PublicDashboard{
 				Uid:          anotherPdUid,
 				DashboardUid: anotherSavedDashboard.Uid,
@@ -365,8 +349,6 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 		}
 		// update initial record
 		err = publicdashboardStore.UpdatePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
-			DashboardUid:    savedDashboard.Uid,
-			OrgId:           savedDashboard.OrgId,
 			PublicDashboard: updatedPublicDashboard,
 		})
 		require.NoError(t, err)
diff --git a/pkg/services/publicdashboards/models/models.go b/pkg/services/publicdashboards/models/models.go
index c90502fe827..0feb241552b 100644
--- a/pkg/services/publicdashboards/models/models.go
+++ b/pkg/services/publicdashboards/models/models.go
@@ -113,7 +113,5 @@ type SavePublicDashboardConfigDTO struct {
 //
 
 type SavePublicDashboardConfigCommand struct {
-	DashboardUid    string
-	OrgId           int64
 	PublicDashboard PublicDashboard
 }
diff --git a/pkg/services/publicdashboards/service/service.go b/pkg/services/publicdashboards/service/service.go
index 6e9f789480a..aef2568944f 100644
--- a/pkg/services/publicdashboards/service/service.go
+++ b/pkg/services/publicdashboards/service/service.go
@@ -124,8 +124,6 @@ func (pd *PublicDashboardServiceImpl) savePublicDashboardConfig(ctx context.Cont
 	}
 
 	cmd := SavePublicDashboardConfigCommand{
-		DashboardUid: dto.DashboardUid,
-		OrgId:        dto.OrgId,
 		PublicDashboard: PublicDashboard{
 			Uid:          uid,
 			DashboardUid: dto.DashboardUid,