diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38e3855f2..123ef1f94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added the database model and endpoints to manage the stock splits of an asset profile (experimental)
 
+### Fixed
+
+- Fixed the loading state in the user detail dialog of the admin control panel’s users section
+
 ## 3.40.0 - 2026-08-02
 
 ### Changed
diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
index 9e341037a..3aec4d42c 100644
--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
@@ -56,14 +56,18 @@ export class GfUserDetailDialogComponent implements OnInit {
   protected readonly baseCurrency: string;
   protected readonly canDeleteUser = canDeleteUser;
   protected readonly getCountryName = getCountryName;
+  protected isLoading = true;
+
   protected readonly subscriptionsDataSource =
     new MatTableDataSource<Subscription>();
+
   protected readonly subscriptionsDisplayedColumns = [
     'createdAt',
     'type',
     'price',
     'expiresAt'
   ];
+
   protected user: AdminUserResponse;
 
   protected readonly data = inject<UserDetailDialogParams>(MAT_DIALOG_DATA);
@@ -72,6 +76,7 @@ export class GfUserDetailDialogComponent implements OnInit {
   private readonly changeDetectorRef = inject(ChangeDetectorRef);
   private readonly dataService = inject(DataService);
   private readonly destroyRef = inject(DestroyRef);
+
   private readonly dialogRef =
     inject<MatDialogRef<GfUserDetailDialogComponent, UserDetailDialogResult>>(
       MatDialogRef
@@ -101,6 +106,8 @@ export class GfUserDetailDialogComponent implements OnInit {
 
         this.subscriptionsDataSource.data = this.user.subscriptions ?? [];
 
+        this.isLoading = false;
+
         this.changeDetectorRef.markForCheck();
       });
   }
diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
index e2cdb66a5..b77e0043e 100644
--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
@@ -36,12 +36,14 @@
           i18n
           size="medium"
           [enableCopyToClipboardButton]="true"
-          [value]="user?.id"
+          [value]="isLoading ? undefined : user.id"
           >User ID</gf-value
         >
       </div>
       <div class="col-6 mb-3">
-        <gf-value i18n size="medium" [value]="user?.role">Role</gf-value>
+        <gf-value i18n size="medium" [value]="isLoading ? undefined : user.role"
+          >Role</gf-value
+        >
       </div>
     </div>
 
@@ -52,7 +54,7 @@
           size="medium"
           [isDate]="true"
           [locale]="data.locale"
-          [value]="user?.createdAt"
+          [value]="isLoading ? undefined : user.createdAt"
           >Registration Date</gf-value
         >
       </div>
@@ -61,7 +63,7 @@
           i18n
           size="medium"
           [locale]="data.locale"
-          [value]="user?.provider"
+          [value]="isLoading ? undefined : user.provider"
           >Authentication</gf-value
         >
       </div>
@@ -74,7 +76,9 @@
             i18n
             size="medium"
             [locale]="data.locale"
-            [value]="user?.subscription ? 'Premium' : 'Basic'"
+            [value]="
+              isLoading ? undefined : user.subscription ? 'Premium' : 'Basic'
+            "
             >Membership</gf-value
           >
         </div>
@@ -83,7 +87,11 @@
             i18n
             size="medium"
             [value]="
-              user?.country ? getCountryName({ code: user.country }) : '-'
+              isLoading
+                ? undefined
+                : user.country
+                  ? getCountryName({ code: user.country })
+                  : '-'
             "
             >Country</gf-value
           >
@@ -97,7 +105,7 @@
           i18n
           size="medium"
           [locale]="data.locale"
-          [value]="user?.accountCount"
+          [value]="isLoading ? undefined : user.accountCount"
           >Accounts</gf-value
         >
       </div>
@@ -106,7 +114,7 @@
           i18n
           size="medium"
           [locale]="data.locale"
-          [value]="user?.activityCount"
+          [value]="isLoading ? undefined : user.activityCount"
           >Activities</gf-value
         >
       </div>
@@ -120,7 +128,7 @@
             size="medium"
             [locale]="data.locale"
             [precision]="0"
-            [value]="user?.engagement"
+            [value]="isLoading ? undefined : user.engagement"
             >Engagement per Day</gf-value
           >
         </div>
@@ -129,7 +137,7 @@
             i18n
             size="medium"
             [locale]="data.locale"
-            [value]="user?.dailyApiRequests"
+            [value]="isLoading ? undefined : user.dailyApiRequests"
             >API Requests Today</gf-value
           >
         </div>