diff --git a/lib/src/track/remote/remote.dart b/lib/src/track/remote/remote.dart
index 8db2d09ee..cb413345d 100644
--- a/lib/src/track/remote/remote.dart
+++ b/lib/src/track/remote/remote.dart
@@ -43,8 +43,8 @@ abstract class RemoteTrack extends Track {
 
   @override
   Future<bool> stop() async {
-    final didStop = await super.stop() || !muted;
-    if (didStop) {
+    final didStop = await super.stop();
+    if (didStop || !muted) {
       await disable();
     }
     return didStop;
diff --git a/lib/src/track/track.dart b/lib/src/track/track.dart
index d03f9276c..6ee7ef6d5 100644
--- a/lib/src/track/track.dart
+++ b/lib/src/track/track.dart
@@ -155,6 +155,7 @@ abstract class Track extends DisposableChangeNotifier
     try {
       if (_active || !_muted) {
         mediaStreamTrack.enabled = false;
+        if (!_muted) _muted = true;
       }
     } catch (_) {
       logger.warning(