diff --git a/plugins/inputs/influxdb_v2_listener/influxdb_v2_listener.go b/plugins/inputs/influxdb_v2_listener/influxdb_v2_listener.go
index 612521f97..07146192f 100644
--- a/plugins/inputs/influxdb_v2_listener/influxdb_v2_listener.go
+++ b/plugins/inputs/influxdb_v2_listener/influxdb_v2_listener.go
@@ -166,12 +166,12 @@ func (h *InfluxDBV2Listener) Start(acc telegraf.Accumulator) error {
 				case <-h.ctx.Done():
 					return
 				case info := <-h.trackingAcc.Delivered():
+					h.countLock.Lock()
 					if count, ok := h.trackingMetricCount[info.ID()]; ok {
-						h.countLock.Lock()
 						h.totalUndeliveredMetrics.Add(-count)
 						delete(h.trackingMetricCount, info.ID())
-						h.countLock.Unlock()
 					}
+					h.countLock.Unlock()
 				}
 			}
 		}()