diff --git a/.changeset/org-list-skeleton-avatars.md b/.changeset/org-list-skeleton-avatars.md
new file mode 100644
index 00000000000..6cd3fab714d
--- /dev/null
+++ b/.changeset/org-list-skeleton-avatars.md
@@ -0,0 +1,5 @@
+---
+'@clerk/mosaic': patch
+---
+
+Fix the `OrganizationList` loading skeleton. Avatar placeholders now match the size of the loaded avatars instead of shrinking to the width of the initials, and the personal account row is shown unless `hidePersonal` is set.
diff --git a/packages/mosaic/src/features/organization-list/organization-list.skeleton.tsx b/packages/mosaic/src/features/organization-list/organization-list.skeleton.tsx
index c75b2e6daa9..addba29d1d0 100644
--- a/packages/mosaic/src/features/organization-list/organization-list.skeleton.tsx
+++ b/packages/mosaic/src/features/organization-list/organization-list.skeleton.tsx
@@ -27,26 +27,42 @@ export function OrganizationListSkeleton({
variant='outline'
aria-hidden
>
+ {hidePersonal ? null : (
+
+ )}
{PLACEHOLDER_ORGANIZATIONS.map(name => (
-
-
-
-
-
-
-
-
- {name}
-
-
-
+
))}
);
}
+
+function SkeletonRow({ name, shape }: { name: string; shape: 'circle' | 'square' }) {
+ return (
+
+
+
+
+
+
+
+
+ {name}
+
+
+
+ );
+}