diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 56246a031d..2e69f15ff5 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -444,10 +444,20 @@ namespace osu.Game.Overlays.Mods
                 if (!Stacked)
                     modEnumeration = ModValidation.FlattenMods(modEnumeration);
 
-                section.Mods = modEnumeration.Where(IsValidMod);
+                section.Mods = modEnumeration.Select(validModOrNull).Where(m => m != null);
             }
         }
 
+        [CanBeNull]
+        private Mod validModOrNull([NotNull] Mod mod)
+        {
+            if (!(mod is MultiMod multi))
+                return IsValidMod(mod) ? mod : null;
+
+            var validSubset = multi.Mods.Select(validModOrNull).Where(m => m != null).ToArray();
+            return validSubset.Length == 0 ? null : new MultiMod(validSubset);
+        }
+
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             foreach (var section in ModSectionsContainer.Children)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 22a58add70..659551abfd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                userModsSelectOverlay = new UserModSelectOverlay
+                userModsSelectOverlay = new SoloModSelectOverlay
                 {
                     SelectedMods = { BindTarget = UserMods },
                     IsValidMod = _ => false
@@ -351,10 +351,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
         }
-
-        private class UserModSelectOverlay : SoloModSelectOverlay
-        {
-            protected override bool Stacked => false;
-        }
     }
 }