diff --git a/eslint-configs/defaults.js b/eslint-configs/defaults.js
index f5f3ed5fd..6845510b3 100644
--- a/eslint-configs/defaults.js
+++ b/eslint-configs/defaults.js
@@ -18,6 +18,7 @@ module.exports = {
     "no-return-await": "off",
     "@typescript-eslint/return-await": ["error", "always"],
     "no-multiple-empty-lines": "warn",
+    "@typescript-eslint/await-thenable": "error",
     "@typescript-eslint/member-delimiter-style": [
       "error",
       {
diff --git a/packages/stack-server/src/components/form-dialog.tsx b/packages/stack-server/src/components/form-dialog.tsx
index 64d6e431a..5729fba0d 100644
--- a/packages/stack-server/src/components/form-dialog.tsx
+++ b/packages/stack-server/src/components/form-dialog.tsx
@@ -23,7 +23,7 @@ export function SmartFormDialog<S extends yup.ObjectSchema<any, any, any, any>>(
     if (res !== 'prevent-close') {
       setOpenState(false);
       props.onOpenChange?.(false);
-      await props.onClose?.();
+      props.onClose?.();
     }
   };
 
@@ -73,7 +73,7 @@ export function FormDialog<F extends FieldValues>(
       form.reset();
       if (result !== 'prevent-close') {
         setOpenState(false);
-        await props.onClose?.();
+        props.onClose?.();
         props.onOpenChange?.(false);
       }
     } finally {
diff --git a/packages/stack-server/src/lib/tokens.tsx b/packages/stack-server/src/lib/tokens.tsx
index 855c49140..0492af5f9 100644
--- a/packages/stack-server/src/lib/tokens.tsx
+++ b/packages/stack-server/src/lib/tokens.tsx
@@ -46,7 +46,7 @@ export async function createAuthTokens({
   projectId: string,
   projectUserId: string,
 }) {
-  const refreshToken =  await generateSecureRandomString();
+  const refreshToken = generateSecureRandomString();
   const accessToken = await encodeAccessToken({
     projectId,
     userId: projectUserId,
diff --git a/packages/stack/src/lib/stack-app.ts b/packages/stack/src/lib/stack-app.ts
index 0ed0ead63..4283ae10b 100644
--- a/packages/stack/src/lib/stack-app.ts
+++ b/packages/stack/src/lib/stack-app.ts
@@ -1387,7 +1387,7 @@ class _StackServerAppImpl<HasTokenStore extends boolean, ProjectId extends strin
   }
 
   async createPermissionDefinition(data: ServerPermissionDefinitionCustomizableJson): Promise<ServerPermission>{
-    const permission = await this._serverPermissionFromJson(await this._interface.createPermissionDefinition(data));
+    const permission = this._serverPermissionFromJson(await this._interface.createPermissionDefinition(data));
     await this._serverTeamPermissionDefinitionsCache.refresh([]);
     return permission;
   }