diff --git a/app/Settings/SettingService.php b/app/Settings/SettingService.php
index 48ae7d0f2..489963aad 100644
--- a/app/Settings/SettingService.php
+++ b/app/Settings/SettingService.php
@@ -75,7 +75,7 @@ class SettingService
      */
     public function getForCurrentUser($key, $default = false)
     {
-        return $this->getUser(auth()->user(), $key, $default);
+        return $this->getUser(user(), $key, $default);
     }
 
     /**
diff --git a/resources/views/components/expand-toggle.blade.php b/resources/views/components/expand-toggle.blade.php
index 231b13741..e8b2220e5 100644
--- a/resources/views/components/expand-toggle.blade.php
+++ b/resources/views/components/expand-toggle.blade.php
@@ -4,7 +4,7 @@ $key - Unique key for checking existing stored state.
 --}}
 <?php $isOpen = setting()->getForCurrentUser('section_expansion#'. $key); ?>
 <a expand-toggle="{{ $target }}"
-   expand-toggle-update-endpoint="{{ baseUrl('/settings/users/'. auth()->user()->id .'/update-expansion-preference/' . $key) }}"
+   expand-toggle-update-endpoint="{{ baseUrl('/settings/users/'. $currentUser->id .'/update-expansion-preference/' . $key) }}"
    expand-toggle-is-open="{{ $isOpen ? 'yes' : 'no' }}"
    class="text-muted icon-list-item text-primary">
     <span>@icon('expand-text')</span>