diff --git a/pkg/tsdb/elasticsearch/client/client_test.go b/pkg/tsdb/elasticsearch/client/client_test.go
index 7c4461eb4d6..ee218ed31e2 100644
--- a/pkg/tsdb/elasticsearch/client/client_test.go
+++ b/pkg/tsdb/elasticsearch/client/client_test.go
@@ -118,6 +118,12 @@ func TestClient_Index(t *testing.T) {
 		patternInDatasource string
 		indexInRequest      []string
 	}{
+		{
+			name:                "empty string",
+			indexInDatasource:   "",
+			patternInDatasource: "",
+			indexInRequest:      []string{},
+		},
 		{
 			name:                "single string",
 			indexInDatasource:   "logs-*",
diff --git a/pkg/tsdb/elasticsearch/client/index_pattern.go b/pkg/tsdb/elasticsearch/client/index_pattern.go
index 625841a7893..ff2e1205068 100644
--- a/pkg/tsdb/elasticsearch/client/index_pattern.go
+++ b/pkg/tsdb/elasticsearch/client/index_pattern.go
@@ -35,7 +35,11 @@ type staticIndexPattern struct {
 }
 
 func (ip *staticIndexPattern) GetIndices(timeRange backend.TimeRange) ([]string, error) {
-	return []string{ip.indexName}, nil
+	if ip.indexName != "" {
+		return []string{ip.indexName}, nil
+	} else {
+		return []string{}, nil
+	}
 }
 
 type intervalGenerator interface {