diff --git a/FredBoat/src/main/java/fredboat/command/music/control/PlayCommand.kt b/FredBoat/src/main/java/fredboat/command/music/control/PlayCommand.kt
index b65d89de9..987f3d051 100644
--- a/FredBoat/src/main/java/fredboat/command/music/control/PlayCommand.kt
+++ b/FredBoat/src/main/java/fredboat/command/music/control/PlayCommand.kt
@@ -79,7 +79,7 @@ class PlayCommand(private val playerLimiter: PlayerLimiter, private val trackSea
             return
         }
 
-        if (TextUtils.isSplitSelect(context.rawArgs)) {
+        if (TextUtils.isSplitSelect(context.rawArgs) && videoSelectionCache[context.member] != null) {
             SelectCommand.select(context, videoSelectionCache)
             return
         }
diff --git a/FredBoat/src/main/java/fredboat/util/TextUtils.java b/FredBoat/src/main/java/fredboat/util/TextUtils.java
index 5fb095711..4d1194702 100644
--- a/FredBoat/src/main/java/fredboat/util/TextUtils.java
+++ b/FredBoat/src/main/java/fredboat/util/TextUtils.java
@@ -68,7 +68,7 @@ public class TextUtils {
                     .precomputed();
 
     public static final CharMatcher SPLIT_SELECT_ALLOWED =
-            SPLIT_SELECT_SEPARATOR.or(CharMatcher.inRange('0', '9'))
+            SPLIT_SELECT_SEPARATOR.or(CharMatcher.inRange('1', '5'))
                     .precomputed();
 
     public static final Splitter COMMA_OR_WHITESPACE = Splitter.on(SPLIT_SELECT_SEPARATOR)