diff --git a/osu.Game.Mode.Osu/OsuRuleset.cs b/osu.Game.Mode.Osu/OsuRuleset.cs
index 4e8b8fde2b..ac43e5501c 100644
--- a/osu.Game.Mode.Osu/OsuRuleset.cs
+++ b/osu.Game.Mode.Osu/OsuRuleset.cs
@@ -13,8 +13,10 @@ namespace osu.Game.Modes.Osu
     {
         public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
 
-        public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new UI.OsuHitRenderer { Objects = objects };
+        public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new OsuHitRenderer { Objects = objects };
 
         public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
+
+        protected override PlayMode PlayMode => PlayMode.Osu;
     }
 }
diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index 38edc6714b..0195859cb7 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Modes.Catch
 
         public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new CatchHitRenderer { Objects = objects };
 
-        protected override PlayMode PlayMode => PlayMode.Mania;
+        protected override PlayMode PlayMode => PlayMode.Catch;
 
         public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
     }
diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs
index dddcd0d0c5..d35aab6568 100644
--- a/osu.Game/Modes/Ruleset.cs
+++ b/osu.Game/Modes/Ruleset.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Modes
 
         public static void Register(Ruleset ruleset) => availableRulesets.TryAdd(ruleset.PlayMode, ruleset.GetType());
 
-        protected virtual PlayMode PlayMode => PlayMode.Osu;
+        protected abstract PlayMode PlayMode { get; }
 
         public static Ruleset GetRuleset(PlayMode mode)
         {