diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/toolbar/toolbar-media-buttons/toolbar-media-buttons.component.html b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/toolbar/toolbar-media-buttons/toolbar-media-buttons.component.html
index 1356d0fc..6366a1ea 100644
--- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/toolbar/toolbar-media-buttons/toolbar-media-buttons.component.html
+++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/toolbar/toolbar-media-buttons/toolbar-media-buttons.component.html
@@ -199,17 +199,17 @@
 
 <!-- Leave session button -->
 @if (showLeaveButtonDirect()) {
-	@if (toolbarLeaveButtonTemplate) {
-		<ng-container *ngTemplateOutlet="toolbarLeaveButtonTemplate"></ng-container>
-	} @else {
-		<button
-			mat-icon-button
-			(click)="onLeaveClick()"
-			id="leave-btn"
-			[class.mobile-btn]="isMobileView()"
-			matTooltip="{{ 'TOOLBAR.LEAVE' | translate }}"
-		>
-			<mat-icon>call_end</mat-icon>
-		</button>
-	}
+	<button
+		mat-icon-button
+		(click)="onLeaveClick()"
+		id="leave-btn"
+		[class.mobile-btn]="isMobileView()"
+		matTooltip="{{ 'TOOLBAR.LEAVE' | translate }}"
+	>
+		<mat-icon>call_end</mat-icon>
+	</button>
+}
+
+@if (toolbarLeaveButtonTemplate) {
+	<ng-container *ngTemplateOutlet="toolbarLeaveButtonTemplate"></ng-container>
 }
diff --git a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/template/internals.directive.ts b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/template/internals.directive.ts
index 14be054d..e38b670d 100644
--- a/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/template/internals.directive.ts
+++ b/openvidu-components-angular/projects/openvidu-components-angular/src/lib/directives/template/internals.directive.ts
@@ -223,13 +223,12 @@ export class ParticipantPanelAfterLocalParticipantDirective {
 }
 
 /**
- * The ***ovLeaveButton** directive allows you to replace the default leave button with a custom template.
- * Use this directive to provide your own button, confirm dialogs, or any custom leave logic while keeping
- * the internal leave flow intact.
+ * The ***ovLeaveButton** directive allows you to inject a custom leave button template. You can use the toolbarLeaveButton = false for
+ * replacing the default leave button with your custom one.
  *
  * Usage example:
  * ```html
- * <ov-videoconference>
+ * <ov-videoconference [toolbarLeaveButton]="false">
  *   <ng-container *ovLeaveButton>
  *     <button class="my-leave-button" (click)="customLeave()">
  *       Leave meeting