diff --git a/src/App/UserSelfManagementService.php b/src/App/UserSelfManagementService.php
index edf09527..f4f7eab3 100644
--- a/src/App/UserSelfManagementService.php
+++ b/src/App/UserSelfManagementService.php
@@ -75,7 +75,7 @@ final class UserSelfManagementService
     public function resolveActiveSkin(?string $requestedSkin, array $authUser, array $visibleApps, array $widgets, array $availableSkins): array
     {
         $settings = $this->load($authUser, $visibleApps, $widgets, $availableSkins);
-        $storedSkin = (string) (($settings['desktop']['active_skin'] ?? '') ?: SkinResolver::DEFAULT_SKIN);
+        $storedSkin = (string) (($settings['desktop']['active_skin'] ?? '') ?: $this->defaultSkin());
         $resolvedSkin = SkinResolver::resolve($requestedSkin !== null && $requestedSkin !== '' ? $requestedSkin : $storedSkin);
 
         if ($resolvedSkin !== $storedSkin) {
@@ -219,7 +219,7 @@ final class UserSelfManagementService
             'profile' => $profile,
             'desktop' => [
                 'active_skin' => $this->sanitizeSkin(
-                    (string) ($settings['desktop']['active_skin'] ?? SkinResolver::DEFAULT_SKIN),
+                    (string) ($settings['desktop']['active_skin'] ?? $this->defaultSkin()),
                     $availableSkins
                 ),
             ],
@@ -271,7 +271,12 @@ final class UserSelfManagementService
     {
         $resolved = SkinResolver::resolve($skin);
 
-        return in_array($resolved, $availableSkins, true) ? $resolved : SkinResolver::DEFAULT_SKIN;
+        return in_array($resolved, $availableSkins, true) ? $resolved : $this->defaultSkin();
+    }
+
+    private function defaultSkin(): string
+    {
+        return SkinResolver::resolve(null);
     }
 
     /**