diff --git a/public/forum/forum.php b/public/forum/forum.php
index 7354ff76..d96a8249 100644
--- a/public/forum/forum.php
+++ b/public/forum/forum.php
@@ -37,7 +37,7 @@ if ($forum['forum_type'] == MSZ_FORUM_TYPE_LINK) {
 $forumPagination = pagination_create($forum['forum_topic_count'], 20);
 $topicsOffset = pagination_offset($forumPagination, pagination_param());
 
-if (!pagination_is_valid_offset($topicsOffset)) {
+if (!pagination_is_valid_offset($topicsOffset) && $forum['forum_topic_count'] > 0) {
     echo render_error(404);
     return;
 }
diff --git a/templates/forum/forum.twig b/templates/forum/forum.twig
index 990a5424..e9125145 100644
--- a/templates/forum/forum.twig
+++ b/templates/forum/forum.twig
@@ -4,7 +4,7 @@
 {% set title = forum_info.forum_name %}
 {% set canonical_url = url_construct('/forum/forum.php', {
     'f': forum_info.forum_id,
-    'p': forum_pagination.page > 1 ? forum_pagination.page : 0,
+    'p': forum_pagination.page|default(0) > 1 ? forum_pagination.page : 0,
 }) %}
 
 {% block content %}