diff --git a/gradle/changelog/avatar_size.yaml b/gradle/changelog/avatar_size.yaml
new file mode 100644
index 0000000000..5df228207a
--- /dev/null
+++ b/gradle/changelog/avatar_size.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Avatar size must not leave boundaries
diff --git a/scm-ui/ui-components/src/repos/RepositoryAvatar.tsx b/scm-ui/ui-components/src/repos/RepositoryAvatar.tsx
index 2a9a5c4fe9..4dd62e555e 100644
--- a/scm-ui/ui-components/src/repos/RepositoryAvatar.tsx
+++ b/scm-ui/ui-components/src/repos/RepositoryAvatar.tsx
@@ -36,12 +36,13 @@ type Props = {
   size?: 16 | 24 | 32 | 48 | 64 | 96 | 128;
 };
 
-const renderExtensionPoint = (repository: Repository) => {
+const renderExtensionPoint = (repository: Repository, size: Props["size"]) => {
   return (
     <ExtensionPoint<extensionPoints.PrimaryRepositoryAvatar>
       name="repos.repository-avatar.primary"
       props={{
         repository,
+        size: size || 64
       }}
     >
       <ExtensionPoint<extensionPoints.RepositoryAvatar>
@@ -57,7 +58,7 @@ const renderExtensionPoint = (repository: Repository) => {
 };
 
 const RepositoryAvatar: FC<Props> = ({ repository, size = 64 }) => {
-  return <Avatar className={`image is-${size}x${size}`}>{renderExtensionPoint(repository)}</Avatar>;
+  return <Avatar className={`image is-${size}x${size}`}>{renderExtensionPoint(repository, size)}</Avatar>;
 };
 
 export default RepositoryAvatar;
diff --git a/scm-ui/ui-extensions/src/extensionPoints.ts b/scm-ui/ui-extensions/src/extensionPoints.ts
index e1de447b67..3454533631 100644
--- a/scm-ui/ui-extensions/src/extensionPoints.ts
+++ b/scm-ui/ui-extensions/src/extensionPoints.ts
@@ -433,7 +433,7 @@ export type RepositoryAvatar = RenderableExtensionPointDefinition<
  */
 export type PrimaryRepositoryAvatar = RenderableExtensionPointDefinition<
   "repos.repository-avatar.primary",
-  { repository: Repository }
+  { repository: Repository, size: number }
 >;
 
 /**