diff --git a/src/gz/gfx.c b/src/gz/gfx.c
index 5949eb53..07dea583 100644
--- a/src/gz/gfx.c
+++ b/src/gz/gfx.c
@@ -46,8 +46,7 @@ void gfx_start(void)
 void gfx_mode_init(void)
 {
   gfx_sync();
-  gSPClearGeometryMode(gfx_disp_p++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH |
-                       G_CULL_BOTH | G_FOG | G_LIGHTING);
+  gSPLoadGeometryMode(gfx_disp_p++, 0);
   gDPSetCycleType(gfx_disp_p++, G_CYC_1CYCLE);
   gDPSetRenderMode(gfx_disp_p++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
   gDPSetScissor(gfx_disp_p++, G_SC_NON_INTERLACE,
diff --git a/src/gz/item_option.c b/src/gz/item_option.c
index 81617e27..ae06ab05 100644
--- a/src/gz/item_option.c
+++ b/src/gz/item_option.c
@@ -119,7 +119,7 @@ static int wheel_draw_proc(struct menu_item *item,
   (
     /* rsp state */
     gsDPPipeSync(),
-    gsSPGeometryMode(~0, 0),
+    gsSPLoadGeometryMode(0),
     /* rdp state */
     gsDPSetCycleType(G_CYC_1CYCLE),
     /* texture engine */