diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index 525f23b5ce..37b1b52bfd 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -235,7 +235,8 @@ void Screen::ClearMessageQueue()
 void Screen::ClearMessageQueue( const ScreenMessage SM )
 {
 	for( int i=m_QueuedMessages.size()-1; i>=0; i-- )
-		m_QueuedMessages.erase( m_QueuedMessages.begin()+i ); 
+		if( m_QueuedMessages[i].SM == SM )
+			m_QueuedMessages.erase( m_QueuedMessages.begin()+i ); 
 }