diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
index ad7f8092..8b3facea 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
@@ -60,6 +60,7 @@
             try {
                 var data = JSON.parse(localStorage.getItem("randomPlayQueue"));
             } catch(e) { return; }
+            if (data == null ) { return; }
             elements = form.getElementsByTagName("input");
             for (var i = 0; i < elements.length; i++) {
                 if (elements[i].type == "hidden") continue;