diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
index bf0591aa15..2dfc00503a 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
@@ -66,22 +66,15 @@ export class RolesComponent implements OnInit {
   private readonly injector = inject(Injector);
   protected readonly service = inject(IdentityRoleService);
   protected readonly ssrService = inject(SSRService);
-  ROLES_KEY = makeStateKey<any>('roles');
 
+  ROLES_KEY = makeStateKey<any>('roles');
   data: PagedResultDto<IdentityRoleDto> = { items: [], totalCount: 0 };
-
   form!: UntypedFormGroup;
-
   selected?: IdentityRoleDto;
-
   isModalVisible!: boolean;
-
   visiblePermissions = false;
-
   providerKey?: string;
-
   modalBusy = false;
-
   permissionManagementKey = ePermissionManagementComponents.PermissionManagement;
 
   constructor(private transferState: TransferState) {}
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts
index 40f2d4a342..1442130572 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts
@@ -6,10 +6,11 @@ import {
   NAVIGATE_TO_MANAGE_PROFILE,
   PermissionDirective,
   SessionStateService,
+  SSRService,
   ToInjectorPipe,
 } from '@abp/ng.core';
 import { AbpVisibleDirective, UserMenu, UserMenuService } from '@abp/ng.theme.shared';
-import { Component, Inject, TrackByFunction } from '@angular/core';
+import { Component, inject, Inject, TrackByFunction } from '@angular/core';
 import { Observable } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -29,11 +30,15 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 export class CurrentUserComponent {
   currentUser$: Observable<CurrentUserDto> = this.configState.getOne$('currentUser');
   selectedTenant$ = this.sessionState.getTenant$();
-
   trackByFn: TrackByFunction<UserMenu> = (_, element) => element.id;
+  private ssrService = inject(SSRService);
 
   get smallScreen(): boolean {
-    return window.innerWidth < 992;
+    if (this.ssrService.isSsr) {
+      return false;
+    } else {
+      return window.innerWidth < 992;
+    }
   }
 
   constructor(