diff --git a/Changelog b/Changelog
index 0e1cba4b4..d5879f8e5 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2017-08-29 DariusIII
+	* Chg: Update the browse page for empty browsecount result
 	* Chg: Update maintenance and 503 error pages
 	* Chg: Add basic csrf protection to login and register pages
 	* Chg: Update phpmailer to latest version
diff --git a/public/pages/browse.php b/public/pages/browse.php
index 45add272f..69da479f1 100644
--- a/public/pages/browse.php
+++ b/public/pages/browse.php
@@ -30,19 +30,16 @@ $orderby = isset($_REQUEST['ob']) && in_array($_REQUEST['ob'], $ordering, false)
 
 $results = $releases->getBrowseRange($catarray, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata['categoryexclusions'], $grp);
 
-if(isset($results[0]['_totalcount'])) {
-	$browsecount = $results[0]['_totalcount'];
-}
-
-if (isset($browsecount)) {
-	$page->smarty->assign('pagertotalitems', $browsecount);
-}
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP . '/browse?t=' . $category . '&g=' . $grp . '&ob=' . $orderby . '&offset=');
-$page->smarty->assign('pagerquerysuffix', '#results');
-
+$browsecount = $results[0]['_totalcount'] ?? 0;
 
+$page->smarty->assign(
+	[
+		'pagertotalitems' => $browsecount,
+		'pageroffset'=> $offset,
+		'pageritemsperpage'=> ITEMS_PER_PAGE,
+		'pagerquerybase' => WWW_TOP . '/browse?t=' . $category . '&g=' . $grp . '&ob=' . $orderby . '&offset=',
+		'pagerquerysuffix' => '#results'
+	]);
 
 $pager = $page->smarty->fetch('pager.tpl');
 $page->smarty->assign('pager', $pager);