diff --git a/GPU/Directx9/StateMappingDX9.cpp b/GPU/Directx9/StateMappingDX9.cpp
index b2e4595976..bd580b350e 100644
--- a/GPU/Directx9/StateMappingDX9.cpp
+++ b/GPU/Directx9/StateMappingDX9.cpp
@@ -204,10 +204,13 @@ void DrawEngineDX9::ApplyDrawState(int prim) {
 		if (gstate.isModeClear()) {
 			// Set Cull 
 			dxstate.cullMode.set(false, false);
+			// Well, probably doesn't matter...
+			dxstate.shadeMode.set(D3DSHADE_GOURAUD);
 		} else {
 			// Set cull
 			bool wantCull = !gstate.isModeThrough() && prim != GE_PRIM_RECTANGLES && gstate.isCullEnabled();
 			dxstate.cullMode.set(wantCull, gstate.getCullMode());
+			dxstate.shadeMode.set(gstate.getShadeMode() == GE_SHADE_GOURAUD ? D3DSHADE_GOURAUD : D3DSHADE_FLAT);
 		}
 	}
 
diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index 262ed460a7..1950eab058 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -72,7 +72,8 @@ const CommonCommandTableEntry commonCommandTable[] = {
 	{ GE_CMD_FOGENABLE, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE | DIRTY_FRAGMENTSHADER_STATE},
 	{ GE_CMD_TEXMODE, FLAG_FLUSHBEFOREONCHANGE, DIRTY_TEXTURE_PARAMS | DIRTY_FRAGMENTSHADER_STATE },
 	{ GE_CMD_TEXSHADELS, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE },
-	{ GE_CMD_SHADEMODE, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE | DIRTY_FRAGMENTSHADER_STATE },
+	// Raster state for Direct3D 9, uncommon.
+	{ GE_CMD_SHADEMODE, FLAG_FLUSHBEFOREONCHANGE, DIRTY_VERTEXSHADER_STATE | DIRTY_FRAGMENTSHADER_STATE | DIRTY_RASTER_STATE },
 	{ GE_CMD_TEXFUNC, FLAG_FLUSHBEFOREONCHANGE, DIRTY_FRAGMENTSHADER_STATE },
 	{ GE_CMD_COLORTEST, FLAG_FLUSHBEFOREONCHANGE, DIRTY_FRAGMENTSHADER_STATE },
 	{ GE_CMD_ALPHATESTENABLE, FLAG_FLUSHBEFOREONCHANGE, DIRTY_FRAGMENTSHADER_STATE },
diff --git a/ext/native/gfx/d3d9_state.cpp b/ext/native/gfx/d3d9_state.cpp
index aa20d88151..fe7849b894 100644
--- a/ext/native/gfx/d3d9_state.cpp
+++ b/ext/native/gfx/d3d9_state.cpp
@@ -35,6 +35,7 @@ void DirectXState::Restore() {
 	scissorRect.restore(); count++;
 
 	cullMode.restore(); count++;
+	shadeMode.restore(); count++;
 
 	depthTest.restore(); count++;
 	depthFunc.restore(); count++;
diff --git a/ext/native/gfx/d3d9_state.h b/ext/native/gfx/d3d9_state.h
index a9a8eed86d..3304c22a1e 100644
--- a/ext/native/gfx/d3d9_state.h
+++ b/ext/native/gfx/d3d9_state.h
@@ -455,6 +455,7 @@ public:
 	BoolUnused dither;
 
 	CullMode cullMode;
+	DxState1<D3DRS_SHADEMODE, D3DSHADE_GOURAUD> shadeMode;
 
 	BoolState<D3DRS_ZENABLE, false> depthTest;