diff --git a/channel.js b/channel.js
index 63a72c28..3cf027a6 100644
--- a/channel.js
+++ b/channel.js
@@ -1161,6 +1161,7 @@ Channel.prototype.addMedia = function(data, user) {
         return;
     }
     data.temp = isLive(data.type) || !this.hasPermission(user, "addnontemp");
+    data.queueby = user ? user.name : "";
     data.maxlength = this.hasPermission(user, "exceedmaxlength") ? 0 : this.opts.maxlength;
     var chan = this;
     if(data.id in this.library) {
@@ -1195,9 +1196,6 @@ Channel.prototype.addMedia = function(data, user) {
         return;
     }
 
-    data.temp = isLive(data.type) || !this.hasPermission(user, "addnontemp");
-    data.queueby = user ? user.name : "";
-
     this.playlist.addMedia(data, function(err, item) {
         if(err) {
             if(err === true)
@@ -1213,7 +1211,8 @@ Channel.prototype.addMedia = function(data, user) {
                 after: item.prev ? item.prev.uid : "prepend"
             });
             chan.broadcastPlaylistMeta();
-            chan.cacheMedia(item.media);
+            if(!item.temp)
+                chan.cacheMedia(item.media);
         }
     });
 }
@@ -1237,7 +1236,8 @@ Channel.prototype.addMediaList = function(data, user) {
                 after: item.prev ? item.prev.uid : "prepend"
             });
             chan.broadcastPlaylistMeta();
-            chan.cacheMedia(item.media);
+            if(!item.temp)
+                chan.cacheMedia(item.media);
         }
     });
 }
diff --git a/www/assets/js/ui.js b/www/assets/js/ui.js
index 21d79933..e3dbb61c 100644
--- a/www/assets/js/ui.js
+++ b/www/assets/js/ui.js
@@ -314,7 +314,7 @@ $("#customembed_btn").click(function () {
 
 $("#getplaylist").click(function() {
     var callback = function(data) {
-        PLAYER.hide();
+        hidePlayer();
         socket.listeners("playlist").splice(
             socket.listeners("playlist").indexOf(callback)
         );
@@ -342,7 +342,7 @@ $("#getplaylist").click(function() {
         $("<div/>").addClass("modal-footer").appendTo(modal);
         modal.on("hidden", function() {
             modal.remove();
-            PLAYER.unhide();
+            unhidePlayer();
         });
         modal.modal();
     }