diff --git a/server/main.js b/server/main.js
index 326fdc64..d36457d0 100644
--- a/server/main.js
+++ b/server/main.js
@@ -123,10 +123,10 @@ Meteor.methods({
         };
 
         if (pageIndex * pageLength + pageLength < images.length) {
-            res.nextPage = `/browse/${pageIndex + 1}/${pageLength}/` + encodeURIComponent(folder);
+            res.nextPage = `/browse/${pageIndex + 1}/${pageLength}/` + (encodeURIComponent(folder) || "");
         }
         if (pageIndex > 0) {
-            res.previousPage = `/browse/${pageIndex - 1}/${pageLength}/` + encodeURIComponent(folder);
+            res.previousPage = `/browse/${pageIndex - 1}/${pageLength}/` + (encodeURIComponent(folder) || "");
         }
 
         return res;