diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index d9948aa23c..46d5eb40b4 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Screens.Edit.Compose
             composer = ruleset?.CreateHitObjectComposer();
 
             // make the composer available to the timeline and other components in this screen.
-            dependencies.CacheAs(composer);
+            if (composer != null)
+                dependencies.CacheAs(composer);
 
             return dependencies;
         }