diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp
index f21d4af1..753c8a2d 100644
--- a/src/core/UBPersistenceManager.cpp
+++ b/src/core/UBPersistenceManager.cpp
@@ -186,7 +186,11 @@ void UBPersistenceManager::createDocumentProxiesStructure(const QFileInfoList &c
 
         if (metadatas.contains(UBSettings::documentPageCount))
         {
-            docProxy->setPageCount(metadatas.value(UBSettings::documentPageCount).toInt());
+            int pageCount = metadatas.value(UBSettings::documentPageCount).toInt();
+            if (pageCount == 0)
+                pageCount = sceneCount(docProxy);
+
+            docProxy->setPageCount(pageCount);
         }
         else
         {