diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 6ec8f2bfe5..f6cbe300f3 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -74,7 +74,9 @@ public bool MatchingFilter
             set
             {
                 matchingFilter = value;
-                this.FadeTo(MatchingFilter ? 1 : 0, 200);
+
+                if (IsLoaded)
+                    this.FadeTo(MatchingFilter ? 1 : 0, 200);
             }
         }
 
@@ -203,7 +205,11 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            this.FadeInFromZero(transition_duration);
+
+            if (matchingFilter)
+                this.FadeInFromZero(transition_duration);
+            else
+                Alpha = 0;
         }
 
         private class RoomName : OsuSpriteText
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 4e9f645732..77f4632bf1 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -65,8 +65,6 @@ protected override void LoadComplete()
             filter?.BindValueChanged(f => Filter(f.NewValue), true);
         }
 
-        private FilterCriteria currentFilter;
-
         public void Filter(FilterCriteria criteria)
         {
             roomFlow.Children.ForEach(r =>
@@ -82,15 +80,13 @@ public void Filter(FilterCriteria criteria)
                     {
                         default:
                         case SecondaryFilter.Public:
-                            r.MatchingFilter = r.Room.Availability.Value == RoomAvailability.Public;
+                            matchingFilter &= r.Room.Availability.Value == RoomAvailability.Public;
                             break;
                     }
 
                     r.MatchingFilter = matchingFilter;
                 }
             });
-
-            currentFilter = criteria;
         }
 
         private void addRooms(IEnumerable<Room> rooms)
@@ -98,7 +94,7 @@ private void addRooms(IEnumerable<Room> rooms)
             foreach (var r in rooms)
                 roomFlow.Add(new DrawableRoom(r) { Action = () => selectRoom(r) });
 
-            Filter(currentFilter);
+            filter?.TriggerChange();
         }
 
         private void removeRooms(IEnumerable<Room> rooms)