diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index c347bfe70f..495292a154 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -100,6 +100,7 @@ namespace osu.Game.Screens.Select
             {
                 var autoType = Ruleset.Value.CreateInstance().GetAutoplayMod().GetType();
                 SelectedMods.Value = SelectedMods.Value.Where(m => m.GetType() != autoType).ToArray();
+                modSelect.DeselectTypes(new[] { autoType }, true);
                 removeAutoModOnResume = false;
             }