diff --git a/client/src/app/header/notification-dropdown.component.html b/client/src/app/header/notification-dropdown.component.html
index 50b6cbb25..789a36b17 100644
--- a/client/src/app/header/notification-dropdown.component.html
+++ b/client/src/app/header/notification-dropdown.component.html
@@ -61,13 +61,17 @@
         </div>
 
         <div *ngIf="!loaded" class="loader mt-4">
-          <my-loader size="xl" [loading]="!loaded"></my-loader>
         </div>
 
-        <my-user-notifications
-          [ignoreLoadingBar]="true" [infiniteScroll]="false" [itemsPerPage]="10"
-          [markAllAsReadSubject]="markAllAsReadSubject" (notificationsLoaded)="onNotificationLoaded()"
-        ></my-user-notifications>
+        @defer (when loaded) {
+          <my-user-notifications
+            [ignoreLoadingBar]="true" [infiniteScroll]="false" [itemsPerPage]="10"
+            [markAllAsReadSubject]="markAllAsReadSubject" (notificationsLoaded)="onNotificationLoaded()"
+          ></my-user-notifications>
+        } @placeholder {
+          <my-loader size="xl" [loading]="loaded"></my-loader>
+
+        }
 
         <div class="all-notifications">
           <a *ngIf="loaded" class="text-decoration-underline" routerLink="/my-account/notifications" #notifications (click)="onNavigate(notifications)" i18n>
diff --git a/client/src/app/shared/standalone-notifications/user-notifications.component.ts b/client/src/app/shared/standalone-notifications/user-notifications.component.ts
index a3f25fcc0..4cf3fcffc 100644
--- a/client/src/app/shared/standalone-notifications/user-notifications.component.ts
+++ b/client/src/app/shared/standalone-notifications/user-notifications.component.ts
@@ -38,6 +38,8 @@ export class UserNotificationsComponent implements OnInit {
   ) { }
 
   ngOnInit () {
+    console.log('loaded')
+
     this.componentPagination = {
       currentPage: 1,
       itemsPerPage: this.itemsPerPage, // Reset items per page, because of the @Input() variable
diff --git a/client/src/standalone/videos/shared/player-options-builder.ts b/client/src/standalone/videos/shared/player-options-builder.ts
index fde8783eb..94b103f50 100644
--- a/client/src/standalone/videos/shared/player-options-builder.ts
+++ b/client/src/standalone/videos/shared/player-options-builder.ts
@@ -11,7 +11,7 @@ import {
   VideoState,
   VideoStreamingPlaylistType
 } from '@peertube/peertube-models'
-import { HLSOptions, PeerTubePlayerContructorOptions, PeerTubePlayerLoadOptions, PlayerMode, VideoJSCaption } from '../../../assets/player'
+import { HLSOptions, PeerTubePlayerConstructorOptions, PeerTubePlayerLoadOptions, PlayerMode, VideoJSCaption } from '../../../assets/player'
 import {
   getBoolOrDefault,
   getParamString,
@@ -174,7 +174,7 @@ export class PlayerOptionsBuilder {
   getPlayerConstructorOptions (options: {
     serverConfig: HTMLServerConfig
     authorizationHeader: () => string
-  }): PeerTubePlayerContructorOptions {
+  }): PeerTubePlayerConstructorOptions {
     const { serverConfig, authorizationHeader } = options
 
     return {