diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index b865b68a0d2078460616263d72b66d453324fe7d..4737ce6ec09c364efb011189fa1abc1d2bc9e605 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -655,7 +655,13 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
         }
     }
 
-    public boolean areBookmarksLoaded() { return bookmarksLoaded; }
+    public boolean areBookmarksLoaded() {
+        // No way to tell if old PEP bookmarks are all loaded yet if they are empty
+        // because we don't manually fetch them...
+        if (getXmppConnection().getFeatures().bookmarksConversion()) return true;
+
+        return bookmarksLoaded;
+    }
 
     public void setBookmarks(final Map<Jid, Bookmark> bookmarks) {
         synchronized (this.bookmarks) {