diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index f2328f1056..b2810c982b 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -3,6 +3,7 @@
 - Improved: [#24734] Save files now use Zstd compression for faster saving and smaller files.
 - Improved: [#24893] The ride list now has headers, and can be sorted in both directions.
 - Fix: [#16988] AppImage version does not show changelog.
+- Fix: [#24173] Allow all game speeds between 1 and 8 if developer mode is on.
 
 0.4.25 (2025-08-03)
 ------------------------------------------------------------------------
diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index e4dc752108..bed99493fe 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -905,7 +905,7 @@ namespace OpenRCT2::Ui::Windows
                 {
                     GfxDrawSprite(rt, ImageId(SPR_G2_SPEED_ARROW), screenPos + ScreenCoordsXY{ 5 + i * 5, 15 });
                 }
-                for (int32_t i = 0; i < 3 && i < gGameSpeed - 4 && gGameSpeed >= 5; i++)
+                for (int32_t i = 0; i < 3 && gGameSpeed >= 5; i++)
                 {
                     GfxDrawSprite(rt, ImageId(SPR_G2_HYPER_ARROW), screenPos + ScreenCoordsXY{ 5 + i * 6, 15 });
                 }
diff --git a/src/openrct2/actions/GameSetSpeedAction.cpp b/src/openrct2/actions/GameSetSpeedAction.cpp
index 2a88487b03..aaa7cf81bd 100644
--- a/src/openrct2/actions/GameSetSpeedAction.cpp
+++ b/src/openrct2/actions/GameSetSpeedAction.cpp
@@ -72,5 +72,5 @@ GameActions::Result GameSetSpeedAction::Execute() const
 
 bool GameSetSpeedAction::IsValidSpeed(uint8_t speed) const
 {
-    return (speed >= 1 && speed <= 4) || (Config::Get().general.DebuggingTools && speed == 8);
+    return speed >= 1 && (speed <= 4 || (Config::Get().general.DebuggingTools && speed <= 8));
 }
diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp
index 24f6684802..4075ad106c 100644
--- a/src/openrct2/interface/InteractiveConsole.cpp
+++ b/src/openrct2/interface/InteractiveConsole.cpp
@@ -904,7 +904,7 @@ static void ConsoleCommandSet(InteractiveConsole& console, const arguments_t& ar
         }
         else if (varName == "game_speed" && InvalidArguments(&invalidArgs, int_valid[0]))
         {
-            ConsoleSetVariableAction<GameSetSpeedAction>(console, varName, std::clamp(int_val[0], 1, 8));
+            ConsoleSetVariableAction<GameSetSpeedAction>(console, varName, int_val[0]);
         }
         else if (varName == "console_small_font" && InvalidArguments(&invalidArgs, int_valid[0]))
         {