diff --git a/src/app/pages/dashboard/rooms/player/player.component.ts b/src/app/pages/dashboard/rooms/player/player.component.ts
index 1965db37..499fba2e 100644
--- a/src/app/pages/dashboard/rooms/player/player.component.ts
+++ b/src/app/pages/dashboard/rooms/player/player.component.ts
@@ -21,20 +21,24 @@ export class PlayerComponent {
   }
 
   prev() {
-    if (this.shuffle) {
-      this.track = this.playerService.random();
-    } else {
-      this.track = this.playerService.prev();
+    if (!this.player.loop) {
+      if (this.shuffle) {
+        this.track = this.playerService.random();
+      } else {
+        this.track = this.playerService.prev();
+      }
     }
 
     this.reload();
   }
 
   next() {
-    if (this.shuffle) {
-      this.track = this.playerService.random();
-    } else {
-      this.track = this.playerService.next();
+    if (!this.player.loop) {
+      if (this.shuffle) {
+        this.track = this.playerService.random();
+      } else {
+        this.track = this.playerService.next();
+      }
     }
 
     this.reload();