diff --git a/stepmania/src/ControllerStateDisplay.cpp b/stepmania/src/ControllerStateDisplay.cpp
index ac18a59ac2..761b3f8378 100644
--- a/stepmania/src/ControllerStateDisplay.cpp
+++ b/stepmania/src/ControllerStateDisplay.cpp
@@ -86,6 +86,8 @@ void ControllerStateDisplay::Update( float fDelta )
 	FOREACH_ENUM( ControllerStateButton, b )
 	{
 		Button &button = m_Buttons[ b ];
+		if( !button.spr.IsLoaded() )
+			continue;
 
 		bool bVisible = INPUTMAPPER->IsBeingPressed( button.gi, m_mp );