diff --git a/src/GroupMembershipLoader.php b/src/GroupMembershipLoader.php
index ffe3153..df86622 100644
--- a/src/GroupMembershipLoader.php
+++ b/src/GroupMembershipLoader.php
@@ -127,6 +127,10 @@ class GroupMembershipLoader implements GroupMembershipLoaderInterface {
    * {@inheritdoc}
    */
   public function loadByUser(AccountInterface $account = NULL, $roles = NULL) {
+    if (!isset($account)) {
+      $account = $this->currentUser;
+    }
+
     $cache_id = md5($account->id());
     if ($roles) {
       $cache_id = is_array($roles) ? ':' . md5(implode('-', $roles)) : ':' . md5($roles);
@@ -136,10 +140,6 @@ class GroupMembershipLoader implements GroupMembershipLoaderInterface {
       return $this->userMemberships[$account->id()][$cache_id];
     }
 
-    if (!isset($account)) {
-      $account = $this->currentUser;
-    }
-
     // Load all group content types for the membership content enabler plugin.
     $group_content_types = $this->entityTypeManager
       ->getStorage('group_content_type')