diff --git a/include/config.h b/include/config.h
index a36fb65f..61b96358 100644
--- a/include/config.h
+++ b/include/config.h
@@ -51,6 +51,8 @@
 #define AUTO_LOD
 // Skip peach letter cutscene
 #define PEACH_SKIP
+// Remove course specific camera processing
+#define CAMERA_FIX
 // Uncomment this if you want to skip the title screen (Super Mario 64 logo)
 //#define SKIP_TITLE_SCREEN
 // Uncomment this if you want to keep the mario head and not skip it
diff --git a/src/game/camera.c b/src/game/camera.c
index 624c24fc..13d3fe28 100644
--- a/src/game/camera.c
+++ b/src/game/camera.c
@@ -28,6 +28,7 @@
 #include "paintings.h"
 #include "engine/graph_node.h"
 #include "level_table.h"
+#include "config.h"
 
 #define CBUTTON_MASK (U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS)
 
@@ -3049,8 +3050,9 @@ void update_camera(struct Camera *c) {
     c->nextYaw = gLakituState.nextYaw;
     c->mode = gLakituState.mode;
     c->defMode = gLakituState.defMode;
-
-    //camera_course_processing(c);
+#ifndef CAMERA_FIX
+    camera_course_processing(c);
+#endif
     stub_camera_3(c);
     sCButtonsPressed = find_c_buttons_pressed(sCButtonsPressed, gPlayer1Controller->buttonPressed,
                                               gPlayer1Controller->buttonDown);