diff --git a/src/routes/(console)/organization-[organization]/deleteMember.svelte b/src/routes/(console)/organization-[organization]/deleteMember.svelte
index c2b446335f..a7845fbb3b 100644
--- a/src/routes/(console)/organization-[organization]/deleteMember.svelte
+++ b/src/routes/(console)/organization-[organization]/deleteMember.svelte
@@ -33,7 +33,6 @@
             if (isCloud && $organization) {
                 await checkForUsageLimit($organization);
             }
-            showDelete = false;
             addNotification({
                 type: 'success',
                 message: `${selectedMember.userName || 'User'} was deleted from ${selectedMember.teamName}`
@@ -45,6 +44,8 @@
                 message: error.message
             });
             trackError(error, Submit.MemberDelete);
+        } finally {
+            showDelete = false;
         }
     };
 
diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
index 2982da1fdb..433d9d2351 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -30,6 +30,8 @@
     import Delete from '../deleteMember.svelte';
     import type { PageData } from './$types';
     import Edit from './edit.svelte';
+    import { isCloud } from '$lib/system';
+    import { BillingPlan } from '$lib/constants';
 
     export let data: PageData;
 
@@ -74,8 +76,8 @@
             buttonText={$isOwner ? 'Invite' : ''}
             buttonMethod={() => newMemberModal.set(true)}
             customPillText="Members limited"
-            showPillMessage={!$currentPlan?.addons?.seats?.supported}
-            buttonDisabled={!$currentPlan?.addons?.seats?.supported} />
+            showPillMessage={isCloud && !$currentPlan?.addons?.seats?.supported}
+            buttonDisabled={isCloud && !$currentPlan?.addons?.seats?.supported} />
 
         <TableScroll>
             <TableHeader>
@@ -164,15 +166,18 @@
                                         <span class="icon-dots-horizontal" aria-hidden="true" />
                                     </button>
                                     <svelte:fragment slot="list">
-                                        <DropListItem
-                                            icon="pencil"
-                                            on:click={() => {
-                                                selectedMember = member;
-                                                showEdit = true;
-                                                showDropdown[index] = false;
-                                            }}>
-                                            Edit role
-                                        </DropListItem>
+                                        <!-- TODO: not good, we need data from backend! -->
+                                        {#if isCloud && $currentPlan.$id !== BillingPlan.FREE}
+                                            <DropListItem
+                                                icon="pencil"
+                                                on:click={() => {
+                                                    selectedMember = member;
+                                                    showEdit = true;
+                                                    showDropdown[index] = false;
+                                                }}>
+                                                Edit role
+                                            </DropListItem>
+                                        {/if}
                                         {#if member.invited && !member.joined}
                                             <DropListItem
                                                 icon="refresh"