diff --git a/src/app/pages/dashboard/rooms/player/player.component.scss b/src/app/pages/dashboard/rooms/player/player.component.scss
index 6fdf96a2..12ba71a3 100644
--- a/src/app/pages/dashboard/rooms/player/player.component.scss
+++ b/src/app/pages/dashboard/rooms/player/player.component.scss
@@ -242,8 +242,9 @@
       width: calc(100% - 6rem);
       align-self: flex-start;
       position: absolute;
+      left: 0;
       margin-top: calc(-0.75rem + 1px);
-      margin-left: $player-height;
+      margin-left: calc(#{$player-height} + 0.75rem);
     }
 
     .timing {
diff --git a/src/app/pages/dashboard/rooms/player/player.component.ts b/src/app/pages/dashboard/rooms/player/player.component.ts
index 499fba2e..391ec673 100644
--- a/src/app/pages/dashboard/rooms/player/player.component.ts
+++ b/src/app/pages/dashboard/rooms/player/player.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostBinding, Input } from '@angular/core';
+import { Component, HostBinding, Input, OnDestroy } from '@angular/core';
 import { PlayerService, Track } from '../../../../@core/data/player.service';
 
 @Component({
@@ -6,7 +6,7 @@ import { PlayerService, Track } from '../../../../@core/data/player.service';
   styleUrls: ['./player.component.scss'],
   templateUrl: './player.component.html',
 })
-export class PlayerComponent {
+export class PlayerComponent implements OnDestroy {
   @Input()
   @HostBinding('class.collapsed')
   collapsed: boolean;
@@ -20,6 +20,12 @@ export class PlayerComponent {
     this.createPlayer();
   }
 
+  ngOnDestroy() {
+    this.player.pause();
+    this.player.src = '';
+    this.player.load();
+  }
+
   prev() {
     if (!this.player.loop) {
       if (this.shuffle) {