diff --git a/pkg/services/dashboards/service/search/search.go b/pkg/services/dashboards/service/search/search.go
index e1ce9e9132d..839455d5a8a 100644
--- a/pkg/services/dashboards/service/search/search.go
+++ b/pkg/services/dashboards/service/search/search.go
@@ -8,6 +8,7 @@ import (
 	"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
 	common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
 	"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
 )
@@ -151,6 +152,11 @@ func ParseResults(result *resourcepb.ResourceSearchResponse, offset int64) (v0al
 			_, _ = binary.Decode(row.Cells[scoreIDX], binary.BigEndian, &hit.Score)
 		}
 
+		// Ensure that dashboards+folders always have a folder property returned
+		if hit.Folder == "" {
+			hit.Folder = folder.GeneralFolderUID
+		}
+
 		sr.Hits[i] = *hit
 	}