diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index 4d8bd7c314..248d9b53af 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -413,11 +413,6 @@ void Model::DrawPrimitives()
 				}
 				else
 				{
-					// render the diffuse texture with texture unit 1
-					DISPLAY->SetTexture( 0, mat.diffuse.GetCurrentTexture() );
-					Actor::SetTextureRenderStates();	// set Actor-specified render states
-					DISPLAY->SetSphereEnvironmentMapping( mat.diffuse.m_bSphereMapped );
-					
 					// render the additive texture with texture unit 2
 					if( mat.alpha.GetCurrentTexture() )
 					{
@@ -427,7 +422,16 @@ void Model::DrawPrimitives()
 						DISPLAY->SetTextureModeAdd();
 						DISPLAY->SetTextureFiltering( true );
 					}
+					else
+					{
+						DISPLAY->SetTexture( 1, NULL );
+					}
 
+					// render the diffuse texture with texture unit 1
+					DISPLAY->SetTexture( 0, mat.diffuse.GetCurrentTexture() );
+					Actor::SetTextureRenderStates();	// set Actor-specified render states
+					DISPLAY->SetSphereEnvironmentMapping( mat.diffuse.m_bSphereMapped );
+					
 					/* go */
 					DrawMesh( i );