diff --git a/cwt-angular/src/main/webapp/app/message/chat-input.component.html b/cwt-angular/src/main/webapp/app/message/chat-input.component.html
index 37fd0b78..42a326cf 100644
--- a/cwt-angular/src/main/webapp/app/message/chat-input.component.html
+++ b/cwt-angular/src/main/webapp/app/message/chat-input.component.html
@@ -1,4 +1,4 @@
-<form (submit)="submit()">
+<form #chatForm="ngForm" (submit)="submit(chatForm.valid)">
     <div class="input-group">
         <zemke-tagbox #tagbox ci>
             <input #valueEl
diff --git a/cwt-angular/src/main/webapp/app/message/chat-input.component.ts b/cwt-angular/src/main/webapp/app/message/chat-input.component.ts
index 0d7d6eb4..a916e115 100644
--- a/cwt-angular/src/main/webapp/app/message/chat-input.component.ts
+++ b/cwt-angular/src/main/webapp/app/message/chat-input.component.ts
@@ -79,7 +79,8 @@ export class ChatInputComponent {
                     !this.suggestions.map(u => u.id).includes(user.id) && user.id !== this.authUser.id)));
     }
 
-    submit() {
+    submit(valid: boolean) {
+        if (!valid) return;
         this.disabled = true;
         const message: MessageCreationDto = {
             body: this.value,