diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
index 14d18a5d..15d57515 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
@@ -226,6 +226,8 @@ public class PlayQueue {
     public synchronized void clear() {
         makeBackup();
         files.clear();
+        setRandomSearchCriteria(null);
+        setInternetRadio(null);
         index = 0;
     }
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
index ec35fefc..9aec6388 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
@@ -504,7 +504,6 @@
         $("select#moreActions #removeSelected").prop("disabled", internetRadioEnabled);
         $("select#moreActions #download").prop("disabled", internetRadioEnabled);
         $("select#moreActions #appendPlaylist").prop("disabled", internetRadioEnabled);
-        $("#clearQueue").toggleLink(!internetRadioEnabled);
         $("#shuffleQueue").toggleLink(!internetRadioEnabled);
         $("#repeatQueue").toggleLink(!internetRadioEnabled);
         $("#undoQueue").toggleLink(!internetRadioEnabled);