diff --git a/cwt-angular/src/main/webapp/app/message/chat.component.html b/cwt-angular/src/main/webapp/app/message/chat.component.html
index eb17fd1c..8caa0b99 100644
--- a/cwt-angular/src/main/webapp/app/message/chat.component.html
+++ b/cwt-angular/src/main/webapp/app/message/chat.component.html
@@ -3,10 +3,9 @@
         <form>
             <div class="input-group input-group chat-input">
                 <input type="text" name="chat-input" class="single-line form-control"
-                       [ngModel]="chatInputValue"
-                       (ngModelChange)="chatInputChange.next($event)"
                        (keydown)="onKeydown($event)"
                        (keyup)="onKeyup($event)"
+                       (input)="onInput($event)"
                        id="chat-input">
                 <span class="input-group-append">
                     <button class="btn btn-primary submit" type="button">
diff --git a/cwt-angular/src/main/webapp/app/message/chat.component.ts b/cwt-angular/src/main/webapp/app/message/chat.component.ts
index 1dbdd492..9c5cbfe3 100644
--- a/cwt-angular/src/main/webapp/app/message/chat.component.ts
+++ b/cwt-angular/src/main/webapp/app/message/chat.component.ts
@@ -1,7 +1,5 @@
 import {Component, Inject, Input, OnDestroy, OnInit} from '@angular/core';
 import {RequestService} from "../_services/request.service";
-import {Subject} from 'rxjs';
-import {debounceTime, distinctUntilChanged, map} from 'rxjs/operators';
 import {JwtUser, Message, MessageCategory, MessageCreationDto, MessageDto, UserMinimaDto} from "../custom";
 import {AuthService} from "../_services/auth.service";
 import {Toastr} from "../_services/toastr";
@@ -21,8 +19,6 @@ export class ChatComponent implements OnInit, OnDestroy {
     authUser: JwtUser;
     suggestions: UserMinimalDto[]? = null;
     recipients: UserMinimalDto[] = [];
-    chatInputValue = "";
-    chatInputChange = new Subject<string>();
     private allSuggestions: UserMinimalDto[] = [];
     private readonly messagesSize = 30;
     private oldestMessage: number;
@@ -35,11 +31,6 @@ export class ChatComponent implements OnInit, OnDestroy {
                 private authService: AuthService,
                 private toastr: Toastr,
                 @Inject(APP_CONFIG) private appConfig: AppConfig) {
-        this.chatInputChange.pipe(debounceTime(200), distinctUntilChanged())
-            .subscribe(v => {
-                    this.chatInputValue = v;
-                    this.onInput();
-                });
 
     }
 
@@ -207,7 +198,6 @@ export class ChatComponent implements OnInit, OnDestroy {
                     this.suggestions = res.slice(0, 5);
                 });
         }
-
     }
 
     /**
@@ -298,3 +288,4 @@ ${message.author.username}: ${message.body}`;
                     : this.toastr.info('There are no more messages.'));
     }
 }
+