diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
index d82461feebd96..198aa53cf7d7f 100644
--- a/packages/ui-components/package.json
+++ b/packages/ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-core/ui-components",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "type": "module",
   "exports": {
     "./*": [
diff --git a/packages/ui-components/src/Common/Badge/index.stories.tsx b/packages/ui-components/src/Common/Badge/index.stories.tsx
index b0be6d1f7e863..54103cf94314c 100644
--- a/packages/ui-components/src/Common/Badge/index.stories.tsx
+++ b/packages/ui-components/src/Common/Badge/index.stories.tsx
@@ -49,7 +49,6 @@ export const Medium: Story = {
 
 export const Circular: Story = {
   args: {
-    circular: true,
     children: 'D',
     size: 'small',
     kind: 'error',
@@ -58,7 +57,6 @@ export const Circular: Story = {
 
 export const MediumCircular: Story = {
   args: {
-    circular: true,
     children: 'E',
     kind: 'warning',
   },
diff --git a/packages/ui-components/src/Common/Badge/index.tsx b/packages/ui-components/src/Common/Badge/index.tsx
index a2d61bdecf75d..818759d43555a 100644
--- a/packages/ui-components/src/Common/Badge/index.tsx
+++ b/packages/ui-components/src/Common/Badge/index.tsx
@@ -10,13 +10,11 @@ type BadgeSize = 'small' | 'medium';
 type BadgeProps = HTMLAttributes<HTMLSpanElement> & {
   size?: BadgeSize;
   kind?: BadgeKind;
-  circular?: boolean;
 };
 
 const Badge: FC<PropsWithChildren<BadgeProps>> = ({
   kind = 'default',
   size = 'medium',
-  circular = false,
   className,
   children,
   ...props
@@ -26,7 +24,10 @@ const Badge: FC<PropsWithChildren<BadgeProps>> = ({
       styles.badge,
       styles[kind],
       styles[size],
-      { [styles.circular]: circular },
+      {
+        [styles.circular]:
+          typeof children === 'string' && children.length === 1,
+      },
       className
     )}
     {...props}