diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index afe57da25..206c6f7de 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -776,12 +776,8 @@ func (a *UserInternalAPI) QueryNumericLocalpart(ctx context.Context, res *api.Qu
 }
 
 func (a *UserInternalAPI) QueryAccountAvailability(ctx context.Context, req *api.QueryAccountAvailabilityRequest, res *api.QueryAccountAvailabilityResponse) error {
-	_, err := a.DB.CheckAccountAvailability(ctx, req.Localpart)
-	if err == sql.ErrNoRows {
-		res.Available = true
-		return nil
-	}
-	res.Available = false
+	var err error
+	res.Available, err = a.DB.CheckAccountAvailability(ctx, req.Localpart)
 	return err
 }