diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.html
index 4b52c31d..6fc916f0 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.html
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.html
@@ -12,10 +12,10 @@
 			mat-icon-button
 			(click)="toggleMicrophone()"
 			[disabled]="isConnectionLost || !hasAudioDevices"
-			[class.warn-btn]="!isWebcamAudioActive"
+			[class.warn-btn]="!isAudioActive"
 		>
-			<mat-icon *ngIf="isWebcamAudioActive" matTooltip="Mute your audio" id="mic">mic</mat-icon>
-			<mat-icon *ngIf="!isWebcamAudioActive" matTooltip="Unmute your audio" id="mic_off">mic_off</mat-icon>
+			<mat-icon *ngIf="isAudioActive" matTooltip="Mute your audio" id="mic">mic</mat-icon>
+			<mat-icon *ngIf="!isAudioActive" matTooltip="Unmute your audio" id="mic_off">mic_off</mat-icon>
 		</button>
 
 		<!-- Camera button -->
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts
index c8acb844..1040f384 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts
@@ -28,6 +28,7 @@ import { ParticipantService } from '../../services/participant/participant.servi
 import { MenuType } from '../../models/menu.model';
 import { OpenViduAngularConfigService } from '../../services/config/openvidu-angular.config.service';
 import { ToolbarAdditionalButtonsDirective } from '../../directives/template/openvidu-angular.directive';
+import { ParticipantAbstractModel } from '../../models/participant.model';
 
 /**
  *
@@ -138,7 +139,7 @@ export class ToolbarComponent implements OnInit, OnDestroy {
 	/**
 	 * @ignore
 	 */
-	isWebcamAudioActive: boolean;
+	isAudioActive: boolean;
 	/**
 	 * @ignore
 	 */
@@ -293,9 +294,9 @@ export class ToolbarComponent implements OnInit, OnDestroy {
 				this.participantService.getMyCameraPublisher(),
 				!this.participantService.hasCameraAudioActive()
 			);
-			return;
+		} else {
+			this.openviduService.publishAudio(this.participantService.getMyScreenPublisher(), !this.participantService.hasScreenAudioActive());
 		}
-		this.openviduService.publishAudio(this.participantService.getMyScreenPublisher(), !this.participantService.hasScreenAudioActive());
 	}
 
 	/**
@@ -480,10 +481,10 @@ export class ToolbarComponent implements OnInit, OnDestroy {
 		});
 	}
 	protected subscribeToUserMediaProperties() {
-		this.localParticipantSubscription = this.participantService.localParticipantObs.subscribe((p) => {
+		this.localParticipantSubscription = this.participantService.localParticipantObs.subscribe((p: ParticipantAbstractModel) => {
 			if (p) {
 				this.isWebcamVideoActive = p.isCameraVideoActive();
-				this.isWebcamAudioActive = p.isCameraAudioActive();
+				this.isAudioActive = p.isCameraAudioActive() || p.isScreenAudioActive();
 				this.isScreenShareActive = p.isScreenActive();
 				this.cd.markForCheck();
 			}