diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 8dff614f6c..830d0adc97 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -60,8 +60,8 @@ namespace osu.Game.Graphics.Backgrounds
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            for (int i = 0; i < aimTriangleCount; i++)
-                addTriangle(true);
+
+            addTriangles(true);
         }
 
         private int aimTriangleCount => (int)(DrawWidth * DrawHeight * 0.002f / (triangleScale * triangleScale) * SpawnRatio);
@@ -83,8 +83,8 @@ namespace osu.Game.Graphics.Backgrounds
                     t.Expire();
             }
 
-            while (CreateNewTriangles && Children.Count() < aimTriangleCount)
-                addTriangle(false);
+            if (CreateNewTriangles)
+                addTriangles(false);
         }
 
         protected virtual Triangle CreateTriangle()
@@ -113,12 +113,16 @@ namespace osu.Game.Graphics.Backgrounds
 
         protected virtual Color4 GetTriangleShade() => Interpolation.ValueAt(RNG.NextSingle(), ColourDark, ColourLight, 0, 1);
 
-        private void addTriangle(bool randomY)
+        private void addTriangles(bool randomY)
         {
-            var sprite = CreateTriangle();
-            float triangleHeight = sprite.DrawHeight / DrawHeight;
-            sprite.Position = new Vector2(RNG.NextSingle(), randomY ? RNG.NextSingle() * (1 + triangleHeight) - triangleHeight : 1);
-            Add(sprite);
+            int addCount = aimTriangleCount - Children.Count();
+            for (int i = 0; i < addCount; i++)
+            {
+                var sprite = CreateTriangle();
+                float triangleHeight = sprite.DrawHeight / DrawHeight;
+                sprite.Position = new Vector2(RNG.NextSingle(), randomY ? RNG.NextSingle() * (1 + triangleHeight) - triangleHeight : 1);
+                Add(sprite);
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 77fc010e6d..663c5cf90c 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Overlays.Notifications
 
         public void MarkAllRead()
         {
-            notifications.Children.ForEach(n => n.Read = true);
+            notifications?.Children.ForEach(n => n.Read = true);
         }
     }
 }
\ No newline at end of file