diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c
index 48e5e526..4c19a0fd 100644
--- a/src/engine/fox_play.c
+++ b/src/engine/fox_play.c
@@ -5069,7 +5069,10 @@ void Player_ArwingBoost(Player* player) {
         sp28 = 1.5f;
         sp2C = 0.35f;
     }
-
+    if (CVarGetInteger("gInfiniteBoost", 0)) {
+        sp28 = 0.0f;
+    } 
+    
     player->sfx.boost = 0;
 
     stickY = gInputPress->stick_y; // fake?
@@ -5198,7 +5201,10 @@ void Player_ArwingBrake(Player* player) {
     } else {
         sp30 = 1.5f;
         sp34 = 0.35f;
-    }
+    }    
+    if (CVarGetInteger("gInfiniteBoost", 0)) {
+        sp30 = 0.0f;
+    } 
 
     player->sfx.brake = false;
 
diff --git a/src/engine/fox_tank.c b/src/engine/fox_tank.c
index 1b0b0f61..7e34633b 100644
--- a/src/engine/fox_tank.c
+++ b/src/engine/fox_tank.c
@@ -1120,10 +1120,12 @@ void Tank_UpdateOnRails(Player* player) {
     func_tank_80045348(player);
     if (!player->boostCooldown) {
         if (D_800C9F14 != 0) {
-            if (D_800C9F14 >= 2) {
-                player->boostMeter += 2.0f;
-            } else {
-                player->boostMeter += 1.0f;
+            if (!CVarGetInteger("gInfiniteBoost", 0)) {
+                if (D_800C9F14 >= 2) {
+                    player->boostMeter += 2.0f;
+                } else {
+                    player->boostMeter += 1.0f;
+                }
             }
             if (player->boostMeter > 90.0f) {
                 player->boostMeter = 90.0f;
diff --git a/src/overlays/ovl_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c
index 6e4b58ad..46452c53 100644
--- a/src/overlays/ovl_i3/fox_aq.c
+++ b/src/overlays/ovl_i3/fox_aq.c
@@ -1515,12 +1515,13 @@ void Aquas_BlueMarineBoost(Player* player) {
                 AUDIO_PLAY_SFX(NA_SE_MARINE_BOOST, player->sfxSource, 4);
             }
 
-            player->boostMeter += 3.0f;
-            if (player->boostMeter > 90.0f) {
-                player->boostMeter = 90.0f;
-                player->boostCooldown = 1;
+            if (!CVarGetInteger("gInfiniteBoost", 0)) {
+                player->boostMeter += 3.0f;
+                if (player->boostMeter > 90.0f) {
+                    player->boostMeter = 90.0f;
+                    player->boostCooldown = 1;
+                }
             }
-
             player->boostSpeed += 2.0f;
             if (player->boostSpeed > 10.0f) {
                 player->boostSpeed = 10.0f;
@@ -1563,12 +1564,13 @@ void Aquas_BlueMarineBrake(Player* player) {
             AUDIO_PLAY_SFX(NA_SE_MARINE_BRAKE, player->sfxSource, 4);
         }
 
-        player->boostMeter += 3.0f;
-        if (player->boostMeter > 90.0f) {
-            player->boostMeter = 90.0f;
-            player->boostCooldown = 1;
+        if (!CVarGetInteger("gInfiniteBoost", 0)) {
+            player->boostMeter += 3.0f;
+            if (player->boostMeter > 90.0f) {
+                player->boostMeter = 90.0f;
+                player->boostCooldown = 1;
+            }
         }
-
         player->boostSpeed -= 1.0f;
         if (player->boostSpeed < -20.0f) {
             player->boostSpeed = -20.0f;
diff --git a/src/port/ui/ImguiUI.cpp b/src/port/ui/ImguiUI.cpp
index af36e7df..99dd148d 100644
--- a/src/port/ui/ImguiUI.cpp
+++ b/src/port/ui/ImguiUI.cpp
@@ -476,6 +476,7 @@ void DrawCheatsMenu() {
         UIWidgets::CVarCheckbox("Invincible", "gInvincible");
         UIWidgets::CVarCheckbox("Unbreakable Wings", "gUnbreakableWings");
         UIWidgets::CVarCheckbox("Infinite Bombs", "gInfiniteBombs");
+        UIWidgets::CVarCheckbox("Infinite Boost/Brake", "gInfiniteBoost");
         UIWidgets::CVarCheckbox("Hyper Laser", "gHyperLaser");
         UIWidgets::CVarCheckbox("Self destruct button", "gHit64SelfDestruct", {
                 .tooltip = "Press Down on the D-PAD to instantly self destruct."