diff --git a/.eslintrc.js b/.eslintrc.js
index e1bcd14d..9ee852a4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -34,6 +34,7 @@ module.exports = {
      'import/first': 'error',
      'import/no-duplicates': 'error',
      'simple-import-sort/imports': 'error',
+     'simple-import-sort/exports': 'error',
      '@typescript-eslint/ban-types': [
         'error',
         {
diff --git a/src/whatsapp/models/index.ts b/src/whatsapp/models/index.ts
index e6c6d8b4..ee472de6 100644
--- a/src/whatsapp/models/index.ts
+++ b/src/whatsapp/models/index.ts
@@ -1,7 +1,7 @@
+export * from './auth.model';
 export * from './chat.model';
+export * from './chatwoot.model';
 export * from './contact.model';
 export * from './message.model';
-export * from './auth.model';
-export * from './webhook.model';
-export * from './chatwoot.model';
 export * from './settings.model';
+export * from './webhook.model';
diff --git a/src/whatsapp/routers/index.router.ts b/src/whatsapp/routers/index.router.ts
index f58906b9..3cdcced7 100644
--- a/src/whatsapp/routers/index.router.ts
+++ b/src/whatsapp/routers/index.router.ts
@@ -49,4 +49,4 @@ router
   .use('/chatwoot', new ChatwootRouter(...guards).router)
   .use('/settings', new SettingsRouter(...guards).router);
 
-export { router, HttpStatus };
+export { HttpStatus, router };