diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go
index b51b3aa..7ff621d 100644
--- a/internal/metrics/metrics.go
+++ b/internal/metrics/metrics.go
@@ -40,10 +40,10 @@ func eventToMetrics(event event.SaltEvent, r Registry) {
 			}
 			r.IncreaseScheduledJobReturnTotal(event.Data.Fun, state, event.Data.Id, success)
 		} else {
-			r.IncreaseResponseTotal(event.Data.Id, success) // TODO: move outside the if?
 			r.IncreaseFunctionResponsesTotal(event.Data.Fun, state, event.Data.Id, success)
 		}
 
+		r.IncreaseResponseTotal(event.Data.Id, success)
 		r.SetFunctionStatus(event.Data.Id, event.Data.Fun, state, success)
 	}
 }
diff --git a/internal/metrics/registry.go b/internal/metrics/registry.go
index 7bc116a..7efb44e 100644
--- a/internal/metrics/registry.go
+++ b/internal/metrics/registry.go
@@ -70,7 +70,7 @@ func NewRegistry(config Config) Registry {
 		responseTotal: promauto.NewCounterVec(
 			prometheus.CounterOpts{
 				Name: "salt_responses_total",
-				Help: "Total number of response job processed",
+				Help: "Total number of response job processed, including scheduled job",
 			},
 			[]string{"minion", "success"},
 		),