diff --git a/pkg/collector/client.go b/pkg/collector/client.go
index 50189c6..5fc6363 100644
--- a/pkg/collector/client.go
+++ b/pkg/collector/client.go
@@ -29,6 +29,7 @@ func (c *clientCollector) Collect(ch chan<- prometheus.Metric) {
 	clients, err := client.GetClients()
 	if err != nil {
 		log.Error().Err(err).Msg("Failed to get clients")
+		return
 	}
 
 	ch <- prometheus.MustNewConstMetric(c.omadaClientConnectedTotal, prometheus.GaugeValue, float64(len(clients)),
diff --git a/pkg/collector/controller.go b/pkg/collector/controller.go
index 34f3686..4274edd 100644
--- a/pkg/collector/controller.go
+++ b/pkg/collector/controller.go
@@ -27,6 +27,7 @@ func (c *controllerCollector) Collect(ch chan<- prometheus.Metric) {
 	controller, err := client.GetController()
 	if err != nil {
 		log.Error().Err(err).Msg("Failed to get controller")
+		return
 	}
 
 	ch <- prometheus.MustNewConstMetric(c.omadaControllerUptimeSeconds, prometheus.GaugeValue, controller.Uptime/1000,
diff --git a/pkg/collector/device.go b/pkg/collector/device.go
index 65dbf34..4f1872d 100644
--- a/pkg/collector/device.go
+++ b/pkg/collector/device.go
@@ -36,6 +36,7 @@ func (c *deviceCollector) Collect(ch chan<- prometheus.Metric) {
 	devices, err := client.GetDevices()
 	if err != nil {
 		log.Error().Err(err).Msg("Failed to get devices")
+		return
 	}
 
 	for _, item := range devices {
diff --git a/pkg/collector/port.go b/pkg/collector/port.go
index cf111f3..a326fe4 100644
--- a/pkg/collector/port.go
+++ b/pkg/collector/port.go
@@ -29,6 +29,7 @@ func (c *portCollector) Collect(ch chan<- prometheus.Metric) {
 	devices, err := client.GetDevices()
 	if err != nil {
 		log.Error().Err(err).Msg("Failed to get devices")
+		return
 	}
 
 	for _, device := range devices {