diff --git a/barnard.go b/barnard.go
index 849cd3f..42da32f 100644
--- a/barnard.go
+++ b/barnard.go
@@ -79,10 +79,19 @@ func (b *Barnard) TreeItemKeyPress(ui *uiterm.Ui, tree *uiterm.Tree, item uiterm
     // Handle mute toggle
     if treeItem.Channel != nil {
         if key == *b.Hotkeys.MuteToggle {
-            // Toggle mute for all users in channel
+            // Determine new channel mute state
+            channelWillBeMuted := !b.MutedChannels[treeItem.Channel.ID]
+            
+            // Set all users in channel to the same mute state
             users := makeUsersArray(treeItem.Channel.Users)
             for _, u := range users {
-                b.UserConfig.ToggleMute(u)
+                // Explicitly set user mute state to match channel state
+                if channelWillBeMuted && !u.LocallyMuted {
+                    b.UserConfig.ToggleMute(u)
+                } else if !channelWillBeMuted && u.LocallyMuted {
+                    b.UserConfig.ToggleMute(u)
+                }
+                
                 if u.AudioSource != nil {
                     if u.LocallyMuted {
                         u.AudioSource.SetGain(0)
@@ -92,15 +101,15 @@ func (b *Barnard) TreeItemKeyPress(ui *uiterm.Ui, tree *uiterm.Tree, item uiterm
                 }
             }
 
-            // Toggle channel mute state
-            if b.MutedChannels[treeItem.Channel.ID] {
-                delete(b.MutedChannels, treeItem.Channel.ID)
-            } else {
+            // Update channel mute state
+            if channelWillBeMuted {
                 b.MutedChannels[treeItem.Channel.ID] = true
                 // If this is the current channel, stop transmission
                 if b.Client.Self.Channel.ID == treeItem.Channel.ID && b.Tx {
                     b.StopTransmission()
                 }
+            } else {
+                delete(b.MutedChannels, treeItem.Channel.ID)
             }
 
             b.UiTree.Rebuild()
diff --git a/client.go b/client.go
index 3ed58d0..b4e0dbd 100644
--- a/client.go
+++ b/client.go
@@ -142,9 +142,12 @@ func (b *Barnard) OnUserChange(e *gumble.UserChangeEvent) {
         
         // Check if user is joining a muted channel
         if e.Type.Has(gumble.UserChangeConnected) || e.Type.Has(gumble.UserChangeChannel) {
-            // If the channel is muted, mute the new user
+            // If the channel is muted, ensure the user is muted
             if b.MutedChannels[e.User.Channel.ID] {
-                b.UserConfig.ToggleMute(e.User)
+                // Only mute if not already muted
+                if !e.User.LocallyMuted {
+                    b.UserConfig.ToggleMute(e.User)
+                }
                 if e.User.AudioSource != nil {
                     e.User.AudioSource.SetGain(0)
                 }