diff --git a/packages/ui-avatar/src/Avatar/__tests__/Avatar.test.tsx b/packages/ui-avatar/src/Avatar/__tests__/Avatar.test.tsx
index 79e8c31997..f8a500738c 100644
--- a/packages/ui-avatar/src/Avatar/__tests__/Avatar.test.tsx
+++ b/packages/ui-avatar/src/Avatar/__tests__/Avatar.test.tsx
@@ -166,7 +166,7 @@ describe('<Avatar />', () => {
         <Avatar name="Avatar Name" shape="rectangle" />
       )
       const avatarDiv = container.querySelector('div')
-      expect(avatarDiv).toHaveStyle('border-radius: 0')
+      expect(avatarDiv).toHaveStyle('border-radius: 0rem')
     })
   })
 
diff --git a/packages/ui-avatar/src/Avatar/v2/styles.ts b/packages/ui-avatar/src/Avatar/v2/styles.ts
index 783aeebc50..473050860e 100644
--- a/packages/ui-avatar/src/Avatar/v2/styles.ts
+++ b/packages/ui-avatar/src/Avatar/v2/styles.ts
@@ -158,7 +158,7 @@ const generateStyle = (
       label: 'avatar',
       boxSizing: 'border-box',
       border: getBorder(),
-      borderRadius: shape === 'circle' ? '50%' : 0,
+      borderRadius: shape === 'circle' ? '50%' : componentTheme.rectangleRadius,
       ...sizeStyles[size!],
       background:
         hasInverseColor || color === 'ai'