diff --git a/server/public/assets/js/embed.js b/server/public/assets/js/embed.js
index 26ec1e84..030bd011 100755
--- a/server/public/assets/js/embed.js
+++ b/server/public/assets/js/embed.js
@@ -76,16 +76,14 @@ function receiveMessage(event) {
     }
 }
 
-if(hash.length >= 3 && hash[2] == "autoplay"){
-    autoplay = true;
-    Helper.css("#player", "visibility", "hidden");
-} else {
-    paused = true;
-}
-
 window.addEventListener("message", receiveMessage, false);
 window.addEventListener("DOMContentLoaded", function() {
-
+  if(hash.length >= 3 && hash[2] == "autoplay"){
+      autoplay = true;
+      Helper.css("#player", "visibility", "hidden");
+  } else {
+      //paused = true;
+  }
     if(hash.indexOf("videoonly") > -1) {
         Helper.addClass("#wrapper", "hide");
         Helper.addClass("#controls", "hide");
@@ -122,13 +120,13 @@ window.addEventListener("DOMContentLoaded", function() {
         Player.getTitle(song_title, viewers);
     });
 
+    Player.loadPlayer();
     setup_host_initialization();
     setup_now_playing_listener();
     setup_list_listener();
 
     window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
     socket.on("toast", toast);
-    Player.loadPlayer();
 
     Playercontrols.initSlider();
     document.getElementById("playpause").addEventListener("click", Playercontrols.play_pause);
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 6d71a9d4..a139af83 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -20,6 +20,8 @@ var Player = {
                 Player.np.start = obj.np[0].start;
                 Player.np.end = obj.np[0].end;
                 Player.np.duration = obj.np[0].duration;
+                if(Player.np.start == undefined) Player.np.start = 0;
+                if(Player.np.end == undefined) Player.np.end = Player.np.duration;
 
                 if(!obj.np[0].hasOwnProperty("start")) {
                     Player.np.start = 0;
@@ -45,6 +47,8 @@ var Player = {
                 Player.np.start = obj.np[0].start;
                 Player.np.end = obj.np[0].end;
                 Player.np.duration = obj.np[0].duration;
+                if(Player.np.start == undefined) Player.np.start = 0;
+                if(Player.np.end == undefined) Player.np.end = Player.np.duration;
 
                 if(!obj.np[0].hasOwnProperty("start")) {
                     Player.np.start = 0;