diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css
index 5a7d4d923..3c20cc400 100644
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -717,7 +717,6 @@ table.promoted-attributes-in-tooltip th {
 .tooltip {
     font-size: var(--main-font-size) !important;
     z-index: calc(var(--ck-z-panel) - 1) !important;
-    white-space: pre-wrap;
 }
 
 .tooltip.tooltip-top {
diff --git a/apps/client/src/widgets/react/Badge.tsx b/apps/client/src/widgets/react/Badge.tsx
index e76700b61..6e17ed0ce 100644
--- a/apps/client/src/widgets/react/Badge.tsx
+++ b/apps/client/src/widgets/react/Badge.tsx
@@ -32,7 +32,8 @@ export function Badge({ icon, className, text, tooltip, href, ...containerProps
         fallbackPlacements: [ "bottom" ],
         animation: false,
         html: true,
-        title: tooltip
+        title: tooltip,
+        customClass: "pre-wrap-text"
     });
 
     const content = <>