diff --git a/internal/api/metricstore.go b/internal/api/metricstore.go
index d842256..1bc53be 100644
--- a/internal/api/metricstore.go
+++ b/internal/api/metricstore.go
@@ -20,7 +20,6 @@ import (
 	cclog "github.com/ClusterCockpit/cc-lib/v2/ccLogger"
 	"github.com/ClusterCockpit/cc-lib/v2/schema"
 	"github.com/ClusterCockpit/cc-lib/v2/util"
-
 	"github.com/ClusterCockpit/cc-line-protocol/v2/lineprotocol"
 )
 
@@ -248,15 +247,18 @@ func handleQuery(rw http.ResponseWriter, r *http.Request) {
 		res := make([]APIMetricData, 0, len(sels))
 		for _, sel := range sels {
 			data := APIMetricData{}
-			if ver == "v1" {
-				data.Data, data.From, data.To, data.Resolution, err = ms.Read(sel, query.Metric, req.From, req.To, 0)
-			} else {
-				data.Data, data.From, data.To, data.Resolution, err = ms.Read(sel, query.Metric, req.From, req.To, query.Resolution)
-			}
+
+			data.Data, data.From, data.To, data.Resolution, err = ms.Read(sel, query.Metric, req.From, req.To, query.Resolution)
 			if err != nil {
-				msg := err.Error()
-				data.Error = &msg
-				res = append(res, data)
+				// Skip Error If Just Missing Host or Metric, Continue
+				// Empty Return For Metric Handled Gracefully By Frontend
+				if err != metricstore.ErrNoHostOrMetric {
+					msg := err.Error()
+					data.Error = &msg
+					res = append(res, data)
+				} else {
+					cclog.Warnf("failed to fetch '%s' from host '%s' (cluster: %s): %s", query.Metric, query.Hostname, req.Cluster, err.Error())
+				}
 				continue
 			}