diff --git a/src/commands/loop.js b/src/commands/loop.js
index 41e29d5..08a238d 100644
--- a/src/commands/loop.js
+++ b/src/commands/loop.js
@@ -2,7 +2,7 @@ module.exports = {
     name: 'loop',
     aliases: ['lp'],
     description: 'Turns the music loop mode on or off',
-    usage: 'loop <all/one/off>',
+    usage: 'loop <ap/all/one/off>',
     voiceChannel: true,
     options: [
         {
@@ -22,6 +22,10 @@ module.exports = {
                 {
                     name: "One",
                     value: "one"
+                },
+                {
+                    name: "Autoplay",
+                    value: "ap"
                 }
             ]
         }
@@ -35,10 +39,10 @@ module.exports = {
             return message.reply({ content: `❌ | There is no music currently playing.`, allowedMentions: { repliedUser: false } });
 
         let mode = null;
-        const methods = ['Off', 'Single', 'All'];
+        const methods = ['Off', 'Single', 'All', 'Autoplay'];
 
         if (!args[0])
-            return message.reply({ content: `❌ | ${prefix}loop <all/one/off>`, allowedMentions: { repliedUser: false } });
+            return message.reply({ content: `❌ | ${prefix}loop <ap/all/one/off>`, allowedMentions: { repliedUser: false } });
 
         switch (args[0].toLowerCase()) {
             case 'off':
@@ -50,8 +54,11 @@ module.exports = {
             case 'all' || 'queue':
                 mode = 2;
                 break;
+            case 'ap' || 'autoplay':
+                mode = 3;
+                break;
             default:
-                return message.reply({ content: `❌ | ${prefix}loop <all/one/off>`, allowedMentions: { repliedUser: false } });
+                return message.reply({ content: `❌ | ${prefix}loop <ap/all/one/off>`, allowedMentions: { repliedUser: false } });
         }
         queue.setRepeatMode(mode);
 
@@ -69,16 +76,18 @@ module.exports = {
         const methods = {
             off: 0,
             one: 1,
-            all: 2
+            all: 2,
+            ap: 3
         }
         const names = {
             off: "Off",
             one: "Single",
-            all: "All"
+            all: "All",
+            ap: "Autoplay"
         }
 
         queue.setRepeatMode(methods[interaction.options.getString("mode")]);
 
         return interaction.reply({ content: `Set loop to \`${names[interaction.options.getString("mode")]}\``, allowedMentions: { repliedUser: false } });
     },
-};
+};
\ No newline at end of file
diff --git a/src/events/interactionCreate.js b/src/events/interactionCreate.js
index 5121a0b..4e63b61 100644
--- a/src/events/interactionCreate.js
+++ b/src/events/interactionCreate.js
@@ -82,7 +82,7 @@ module.exports = async (client, int) => {
             } break;
 
             case 'Playing-Loop': {
-                const methods = ['Off', 'Single', 'All'];
+                const methods = ['Off', 'Single', 'All', 'Autoplay'];
                 let mode = 0;
 
                 const select = new StringSelectMenuBuilder()
@@ -117,6 +117,9 @@ module.exports = async (client, int) => {
                         case 'All':
                             mode = 2;
                             break;
+                        case 'Autoplay':
+                            mode = 3;
+                            break;
                     }
                     queue.setRepeatMode(mode);
 
diff --git a/src/utils/player/settings.js b/src/utils/player/settings.js
index 433cc1b..a1c10c9 100644
--- a/src/utils/player/settings.js
+++ b/src/utils/player/settings.js
@@ -1,5 +1,5 @@
 const settings = (queue) => {
-    const loop = queue.repeatMode ? (queue.repeatMode === 2 ? 'All' : 'Single') : 'Off';
+    const loop = queue.repeatMode ? (queue.repeatMode === 2 ? 'All' : (queue.repeatMode === 1 ? 'Single' : (queue.repeatMode === 3 ? 'Autoplay' : 'Off' ))) : 'Off';
     const volume = queue.node.volume;
     const track = queue.currentTrack;
     const author = track.author;