diff --git a/osu.Game.Tests/Visual/Settings/TestSceneLatencyCertifierScreen.cs b/osu.Game.Tests/Visual/Settings/TestSceneLatencyCertifierScreen.cs
index ee18afcbaf..151d9236ea 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneLatencyCertifierScreen.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneLatencyCertifierScreen.cs
@@ -30,6 +30,12 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("set visual mode to circles", () => latencyCertifier.VisualMode.Value = LatencyVisualMode.CircleGameplay);
         }
 
+        [Test]
+        public void TestCycleVisualModes()
+        {
+            AddRepeatStep("cycle mode", () => InputManager.Key(Key.Space), 6);
+        }
+
         [Test]
         public void TestCertification()
         {
diff --git a/osu.Game/Screens/Utility/LatencyCertifierScreen.cs b/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
index 6bd07ac1a4..514fa42248 100644
--- a/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
+++ b/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
@@ -241,7 +241,8 @@ namespace osu.Game.Screens.Utility
             switch (e.Key)
             {
                 case Key.Space:
-                    VisualMode.Value = (LatencyVisualMode)(((int)VisualMode.Value + 1) % 3);
+                    int availableModes = Enum.GetValues(typeof(LatencyVisualMode)).Length;
+                    VisualMode.Value = (LatencyVisualMode)(((int)VisualMode.Value + 1) % availableModes);
                     return true;
 
                 case Key.Tab: