diff --git a/grpcv1.go b/grpcv1.go
index fb6d8e98..ed29500d 100644
--- a/grpcv1.go
+++ b/grpcv1.go
@@ -205,7 +205,12 @@ func (api headscaleV1APIServer) SetTags(
 		}
 	}
 
-	api.h.SetTags(machine, request.GetTags())
+	err = api.h.SetTags(machine, request.GetTags())
+	if err != nil {
+		return &v1.SetTagsResponse{
+			Machine: nil,
+		}, status.Error(codes.Internal, err.Error())
+	}
 
 	log.Trace().
 		Str("machine", machine.Name).