diff --git a/pkg/gatewayconfigurationserver/managed/grpc.go b/pkg/gatewayconfigurationserver/managed/grpc.go
index 128b15a16f..82ff0500d0 100644
--- a/pkg/gatewayconfigurationserver/managed/grpc.go
+++ b/pkg/gatewayconfigurationserver/managed/grpc.go
@@ -217,8 +217,8 @@ func (s *managedGCSServer) Update(
 		return nil, err
 	}
 	ret := &ttnpb.ManagedGateway{}
-	if ret.SetFields(reqGtw, req.FieldMask.GetPaths()...) != nil {
-		return nil, err
+	if errS := ret.SetFields(reqGtw, req.FieldMask.GetPaths()...); errS != nil {
+		return nil, errS
 	}
 	return ret, nil
 }