diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 3bdbc74645..d8e528a55b 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3526,12 +3526,14 @@ NumMisses=6
 [ScreenDemonstration]
 SecondsToShow=30
 Class=ScreenDemonstration
+Fallback=ScreenGameplay
 NextScreen=ScreenRanking
 DifficultiesToShow=easy,medium
 
 [ScreenJukebox]
 ShowCourseModifiers=0
 Class=ScreenJukebox
+Fallback=ScreenGameplay
 
 [ScreenNameEntry]
 Class=ScreenNameEntry