diff --git a/projects/ng-talk/src/lib/components/channel/ng-talk-channel.component.html b/projects/ng-talk/src/lib/components/channel/ng-talk-channel.component.html
index 4bcdb22..fd80c38 100644
--- a/projects/ng-talk/src/lib/components/channel/ng-talk-channel.component.html
+++ b/projects/ng-talk/src/lib/components/channel/ng-talk-channel.component.html
@@ -23,16 +23,16 @@
     }
 
     <!-- Messages -->
-    @for (message of messages(); track trackMessage(index, message); let index = $index) {
+    @for (message of messages(); track trackMessage($index, message)) {
       <!-- Date separator -->
-      @if (message | fn:isSeparatorVisible:this:messages()[index - 1]) {
+      @if (message | fn:isSeparatorVisible:this:messages()[$index - 1]) {
         <div style="clear: both"></div>
         <div class="day-separator">
           <span>{{ message.date | relativeDate : settings }}</span>
         </div>
       }
 
-      <ng-talk-channel-message cdkDrag cdkDragLockAxis="x" [message]="message" [prevMessage]="messages[index - 1]" [cdkDragDisabled]="message.type == MessageType.Writing"
+      <ng-talk-channel-message cdkDrag cdkDragLockAxis="x" [message]="message" [prevMessage]="messages[$index - 1]" [cdkDragDisabled]="message.type == MessageType.Writing"
                                (cdkDragMoved)="onDrag($event)" (cdkDragEnded)="onDragEnded($event, message)"/>
     }
   </div>