diff --git a/public/include/pages/statistics/blockfinder.inc.php b/public/include/pages/statistics/blockfinder.inc.php
index dcf75226..f471afdf 100644
--- a/public/include/pages/statistics/blockfinder.inc.php
+++ b/public/include/pages/statistics/blockfinder.inc.php
@@ -6,21 +6,24 @@ if (!defined('SECURITY')) die('Hacking attempt');
 // Grab Block Finder
 if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
-
   $getBlocksSolvedbyAccount = $statistics->getBlocksSolvedbyAccount();
   $smarty->assign("BLOCKSSOLVEDBYACCOUNT", $getBlocksSolvedbyAccount);
+  
+  if(isset($_SESSION['USERDATA']['id'])){
+    $getBlocksSolvedbyWorker = $statistics->getBlocksSolvedbyWorker($_SESSION['USERDATA']['id']);
+    $smarty->assign("BLOCKSSOLVEDBYWORKER", $getBlocksSolvedbyWorker);
+  }
+
 } else {
   $debug->append('Using cached page', 3);
 }
 
+// Public / private page detection
 if ($setting->getValue('acl_blockfinder_statistics')) {
   $smarty->assign("CONTENT", "finder.tpl");
 } else if ($user->isAuthenticated()) {
-  $getBlocksSolvedbyWorker = $statistics->getBlocksSolvedbyWorker($_SESSION['USERDATA']['id']);
-  $smarty->assign("BLOCKSSOLVEDBYWORKER", $getBlocksSolvedbyWorker);
   $smarty->assign("CONTENT", "finder.tpl");
 } else {
-  $_SESSION['POPUP'][] = array('CONTENT' => 'Block Finders are currently disabled. Please try again later.', 'TYPE' => 'errormsg');
   $smarty->assign("CONTENT", "default.tpl");
 }
 ?>