diff --git a/uYouPlus.xm b/uYouPlus.xm
index acaf4a5..34bdb92 100644
--- a/uYouPlus.xm
+++ b/uYouPlus.xm
@@ -85,15 +85,6 @@ static BOOL IsEnabled(NSString *key) {
 - (BOOL)disableAfmaIdfaCollection { return NO; }
 %end
 
-// Remove “Play next in queue” from the menu (@PoomSmart) - qnblackcat/uYouPlus#1138
-%group gHidePlayNextInQueue
-%hook YTMenuItemVisibilityHandler
-- (BOOL)shouldShowServiceItemRenderer:(YTIMenuConditionalServiceItemRenderer *)renderer {
-    return renderer.icon.iconType == 251 ? NO : %orig;
-}
-%end
-%end
-
 // Reposition "Create" Tab to the Center in the Pivot Bar - qnblackcat/uYouPlus#107
 /*
 static void repositionCreateTab(YTIGuideResponse *response) {
@@ -139,6 +130,13 @@ static void repositionCreateTab(YTIGuideResponse *response) {
 }
 %end
 
+// Remove “Play next in queue” from the menu (@PoomSmart) - qnblackcat/uYouPlus#1138
+%hook YTMenuItemVisibilityHandler
+- (BOOL)shouldShowServiceItemRenderer:(YTIMenuConditionalServiceItemRenderer *)renderer {
+    return IsEnabled(@"hidePlayNextInQueue_enabled") && renderer.icon.iconType == 251 ? NO : %orig;
+}
+%end
+
 # pragma mark - Tweaks
 // IAmYouTube - https://github.com/PoomSmart/IAmYouTube/
 %hook YTVersionUtils
@@ -993,9 +991,6 @@ static void replaceTab(YTIGuideResponse *response) {
     if (IsEnabled(@"hideVideoPlayerShadowOverlayButtons_enabled")) {
         %init(gHideVideoPlayerShadowOverlayButtons);
     }
-    if (IsEnabled(@"hidePlayNextInQueue_enabled")) {
-        %init(gHidePlayNextInQueue);
-    }
     if (IsEnabled(@"disableHints_enabled")) {
         %init(gDisableHints);
     }
@@ -1065,6 +1060,9 @@ static void replaceTab(YTIGuideResponse *response) {
 
     // Change the default value of some options
     NSArray *allKeys = [[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys];
+    if (![allKeys containsObject:@"hidePlayNextInQueue_enabled"]) {
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"hidePlayNextInQueue_enabled"];
+    }
     if (![allKeys containsObject:@"relatedVideosAtTheEndOfYTVideos"]) { 
        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"relatedVideosAtTheEndOfYTVideos"]; 
     }