diff --git a/broker/src/asapo_broker/server/process_request.go b/broker/src/asapo_broker/server/process_request.go
index f3ac333dfaf6018c85fdfa50368354c65406e854..d657344106fcd73b71620f371715ece799f41d01 100644
--- a/broker/src/asapo_broker/server/process_request.go
+++ b/broker/src/asapo_broker/server/process_request.go
@@ -110,7 +110,7 @@ func processRequest(w http.ResponseWriter, r *http.Request, op string, extra_par
 		var ansStats StatsStruct
 		err = json.Unmarshal(answer, &ansStats)
 		if err == nil {
-			delay := (uint64(time.Now().UnixNano()) / uint64(time.Millisecond)) - ansStats.Timestamp
+			delay := (uint64(time.Now().UnixNano()) - ansStats.Timestamp) / uint64(time.Millisecond)
 			switch op {
 			case "next":
 				fallthrough
diff --git a/monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go b/monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go
index e5911d61d3b6b9acb5752d838d28f51168ee17ac..416f17b4e4631f6dc4b780eaaafd93a61e564b42 100644
--- a/monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go
+++ b/monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go
@@ -692,7 +692,7 @@ func (s *QueryServer) GetGroupDelay(ctx context.Context, query *pb.GroupDelayQue
 	result, err := s.dbQueryApi.Query(ctx, "from(bucket: \""+s.settings.InfluxDbDatabase+"\")"+
 		" |> range(start: "+startTime+", stop: "+endTime+")"+
 		" |> filter(fn: (r) => r._measurement == \""+dbMeasurementBrokerFileRequests+"\""+" and r.brokerCommand == \"next\")"+
-		" |> filter(fn: (r) => r.beamtime == \""+query.BeamtimeFilter+"\" r._field == \"delayMs\""+
+		" |> filter(fn: (r) => r.beamtime == \""+query.BeamtimeFilter+"\" and r._field == \"delayMs\""+
 		" |> group(columns: [\"groupId\"])"+
 		" |> last()"+
 		" |> keep(columns: [\"groupId\", \"_value\"])"+