diff --git a/packages/xo-server/src/xo-mixins/rest-api.mjs b/packages/xo-server/src/xo-mixins/rest-api.mjs
index b1baf8d2af2..860bb70e5f9 100644
--- a/packages/xo-server/src/xo-mixins/rest-api.mjs
+++ b/packages/xo-server/src/xo-mixins/rest-api.mjs
@@ -1523,11 +1523,7 @@ export default class RestApi {
           await app.deleteGroup(req.params.id)
           res.sendStatus(204)
         } catch (error) {
-          if (!noSuchObject.is(error) && !featureUnauthorized.is(error)) {
-            return res.status(500).json({ message: 'Internal server error' })
-          }
-
-          throw error
+          return res.status(404).json({ message: error.message })
         }
       }, true)
     )