diff --git a/pkg/search/json_index.go b/pkg/search/json_index.go
index 0b4c335e703..edf791562c9 100644
--- a/pkg/search/json_index.go
+++ b/pkg/search/json_index.go
@@ -47,6 +47,10 @@ func (index *JsonDashIndex) updateLoop() {
 func (index *JsonDashIndex) Search(query *Query) ([]*Hit, error) {
 	results := make([]*Hit, 0)
 
+	if query.IsStarred {
+		return results, nil
+	}
+
 	for _, item := range index.items {
 		if len(results) > query.Limit {
 			break
diff --git a/pkg/search/json_index_test.go b/pkg/search/json_index_test.go
index 38fbf7207d9..52741cc6806 100644
--- a/pkg/search/json_index_test.go
+++ b/pkg/search/json_index_test.go
@@ -31,5 +31,12 @@ func TestJsonDashIndex(t *testing.T) {
 			So(res[0].Title, ShouldEqual, "Home")
 		})
 
+		Convey("Should not return when starred is filtered", func() {
+			res, err := index.Search(&Query{Title: "", Tag: "", IsStarred: true})
+			So(err, ShouldBeNil)
+
+			So(len(res), ShouldEqual, 0)
+		})
+
 	})
 }