diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/itemlist/JiveItemListActivity.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/itemlist/JiveItemListActivity.java
index f5c5ebdc7..b454821dd 100644
--- a/Squeezer/src/main/java/uk/org/ngo/squeezer/itemlist/JiveItemListActivity.java
+++ b/Squeezer/src/main/java/uk/org/ngo/squeezer/itemlist/JiveItemListActivity.java
@@ -344,7 +344,9 @@ protected boolean needPlayer() {
     @Override
     protected void orderPage(@NonNull ISqueezeService service, int start) {
         if (parent != null) {
-            if (action == null || (parent.hasInput() && !parent.isInputReady())) {
+            if (parent.hasSubItems()) {
+                onItemsReceived(parent.subItems.size(), 0, parent.subItems, JiveItem.class);
+            } else if (action == null || (parent.hasInput() && !parent.isInputReady())) {
                 showContent();
             } else
                 service.pluginItems(start, parent, action, this);
@@ -353,14 +355,6 @@ protected void orderPage(@NonNull ISqueezeService service, int start) {
         }
     }
 
-    public void onEventMainThread(HandshakeComplete event) {
-        Log.d(TAG, "Handshake complete");
-        super.onEventMainThread(event);
-        if (parent != null && parent.hasSubItems()) {
-            getItemAdapter().update(parent.subItems.size(), 0, parent.subItems);
-        }
-    }
-
     @MainThread
     public void onEventMainThread(ActivePlayerChanged event) {
         if (action != null && !forActivePlayer(action)) {