diff --git a/protocol_common_utils.go b/protocol_common_utils.go
index 3dc435f3..a189418c 100644
--- a/protocol_common_utils.go
+++ b/protocol_common_utils.go
@@ -75,6 +75,8 @@ func (h *Headscale) marshalResponse(
 			Caller().
 			Err(err).
 			Msg("Cannot marshal response")
+
+		return nil, err
 	}
 
 	if machineKey.IsZero() { // if Noise