diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 26535f269c..4cc6f3469d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -223,6 +223,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override void RequestIntroSkip()
         {
+            // If the room is set up such that the intro is automatically skipped, there's no need to vote on it.
+            if (Configuration.AutomaticallySkipIntro)
+            {
+                base.RequestIntroSkip();
+                return;
+            }
+
             // No base call because we aren't skipping yet.
             client.VoteToSkipIntro().FireAndForget();
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerSkipOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerSkipOverlay.cs
index 68c6fbe7c5..747384b220 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerSkipOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerSkipOverlay.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void updateText()
         {
-            if (client.Room == null)
+            if (client.Room == null || client.Room.Settings.AutoSkip)
                 return;
 
             int countTotal = client.Room.Users.Count(u => u.State == MultiplayerUserState.Playing);