diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index 58b5700882..e2c5d05d32 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -201,16 +201,14 @@ public:
 				}
 			}
 
-			if( UseFallbackOption && FallbackOption == -1 )
+			if( def.selectType == SELECT_ONE && UseFallbackOption )
 			{
-				LOG->Warn( "No options in row \"%s\" were selected, and no fallback row found; selected entry 0", m_sName.c_str() );
-				FallbackOption = 0;
-			}
+				if( FallbackOption == -1 )
+				{
+					LOG->Warn( "No options in row \"%s\" were selected, and no fallback row found; selected entry 0", m_sName.c_str() );
+					FallbackOption = 0;
+				}
 
-			if( def.selectType == SELECT_ONE && 
-				UseFallbackOption && 
-				FallbackOption != -1 )
-			{
 				SelectExactlyOne( FallbackOption, vbSelOut );
 			}
 		}