diff --git a/src/designer/elsa-workflows-designer/src/components/designer/toolbox/toolbox-activities.tsx b/src/designer/elsa-workflows-designer/src/components/designer/toolbox/toolbox-activities.tsx
index 723714021..f5783db3a 100644
--- a/src/designer/elsa-workflows-designer/src/components/designer/toolbox/toolbox-activities.tsx
+++ b/src/designer/elsa-workflows-designer/src/components/designer/toolbox/toolbox-activities.tsx
@@ -112,7 +112,7 @@ export class ToolboxActivities {
                 return (
                   <div class="w-full flex items-center pl-10 pr-2 py-2">
                     <div class="relative cursor-move" onDragStart={e => ToolboxActivities.onActivityStartDrag(e, activityDescriptor)}>
-                      <elsa-tooltip tooltipPosition="right" tooltipContent={<p class="text-gray-600 text-sm">{activityDescriptor.description}</p>}>
+                      <elsa-tooltip tooltipPosition="right" tooltipContent={activityDescriptor.description && <p class="text-gray-600 text-sm">{activityDescriptor.description}</p>}>
                         <div innerHTML={activityHtml} draggable={true} />
                       </elsa-tooltip>
                     </div>
diff --git a/src/designer/elsa-workflows-designer/src/components/shared/tooltip/tooltip.scss b/src/designer/elsa-workflows-designer/src/components/shared/tooltip/tooltip.scss
index da016b46b..03b25e772 100644
--- a/src/designer/elsa-workflows-designer/src/components/shared/tooltip/tooltip.scss
+++ b/src/designer/elsa-workflows-designer/src/components/shared/tooltip/tooltip.scss
@@ -1,10 +1,10 @@
 .tooltip-container {
     .tooltip {
-        opacity: 0;
+        visibility: hidden;
     }
     &:hover {
         .tooltip {
-            opacity: 1;
+            visibility: visible;
         }
     }
 }
\ No newline at end of file