diff --git a/src/app/[orgId]/settings/clients/machine/[niceId]/general/page.tsx b/src/app/[orgId]/settings/clients/machine/[niceId]/general/page.tsx
index 8bb9da553..aeb0cd34f 100644
--- a/src/app/[orgId]/settings/clients/machine/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/[niceId]/general/page.tsx
@@ -209,10 +209,6 @@ export default function GeneralPage() {
                 </SettingsSectionHeader>
 
                 <SettingsSectionBody>
-                    {showRoles && (
-                        <PaidFeaturesAlert tiers={tierMatrix.fullRbac} />
-                    )}
-
                     <SettingsSectionForm>
                         <Form {...form}>
                             <form
@@ -257,15 +253,21 @@ export default function GeneralPage() {
                                 />
 
                                 {showRoles && (
-                                    <OrgRolesTagField
-                                        form={form}
-                                        name="roles"
-                                        orgId={client.orgId}
-                                        supportsMultipleRolesPerUser={true}
-                                        showMultiRolePaywallMessage={false}
-                                        paywallMessage=""
-                                        disabled={!canAssignRoles}
-                                    />
+                                    <>
+                                        <PaidFeaturesAlert
+                                            tiers={tierMatrix.fullRbac}
+                                        />
+
+                                        <OrgRolesTagField
+                                            form={form}
+                                            name="roles"
+                                            orgId={client.orgId}
+                                            supportsMultipleRolesPerUser={true}
+                                            showMultiRolePaywallMessage={false}
+                                            paywallMessage=""
+                                            disabled={!canAssignRoles}
+                                        />
+                                    </>
                                 )}
                             </form>
                         </Form>