diff --git a/controller/northbound/server/auth.go b/controller/northbound/server/auth.go
index 6d9e6410d3cd3bcb20c53a1edd88f24cf43dc1c7..0fd198a1a4a2ae0eeb6b7d8df3e46d42cdf2ec4f 100644
--- a/controller/northbound/server/auth.go
+++ b/controller/northbound/server/auth.go
@@ -185,7 +185,7 @@ func (s AuthServer) handleLogout(ctx context.Context, userName string) error {
 
 		err = removeTokenFromUserIfExists(storedUser, token)
 		if err != nil {
-			status.Errorf(codes.Aborted, "Error removing token from user, it was either already logged out or otherwise not found")
+			return status.Errorf(codes.Aborted, "Error removing token from user, it was either already logged out or otherwise not found")
 		}
 
 		err = s.userService.Update(&rbac.User{UserID: storedUser.ID(),