diff --git a/Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php b/Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php
index 83889ed05..8b07a36e7 100644
--- a/Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php
+++ b/Classes/ViewHelpers/Security/AbstractSecurityViewHelper.php
@@ -338,10 +338,11 @@ public function assertAdminLoggedIn()
      */
     public function getCurrentFrontendUser()
     {
-        if (true === empty($GLOBALS['TSFE']->loginUser)) {
-            return null;
+        if ($GLOBALS['TSFE']->isUserOrGroupSet()) {
+            return $this->frontendUserRepository->findByUid($GLOBALS['TSFE']->fe_user->user['uid']);
         }
-        return $this->frontendUserRepository->findByUid($GLOBALS['TSFE']->fe_user->user['uid']);
+
+        return null;
     }
 
     /**