diff --git a/src/app/components/add-server-dialog/add-server-dialog.component.html b/src/app/components/add-server-dialog/add-server-dialog.component.html
index 3e3932f..3c1e4be 100644
--- a/src/app/components/add-server-dialog/add-server-dialog.component.html
+++ b/src/app/components/add-server-dialog/add-server-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>Add Redis Connection</h1>
   </mat-form-field>
 
   <mat-form-field>
-    <input matInput [min]="1" type="number" placeholder="Port" [(ngModel)]="data.port">
+    <input matInput [min]="1" [max]="65535" type="number" placeholder="Port" [(ngModel)]="data.port">
   </mat-form-field>
 
   <mat-form-field>
diff --git a/src/app/components/add-server-dialog/add-server-dialog.component.ts b/src/app/components/add-server-dialog/add-server-dialog.component.ts
index cc3c7ea..7e1cb5d 100644
--- a/src/app/components/add-server-dialog/add-server-dialog.component.ts
+++ b/src/app/components/add-server-dialog/add-server-dialog.component.ts
@@ -42,7 +42,7 @@ export class AddServerDialogComponent implements OnInit {
       this.data.port = this.util.getValue(this.data.port);
       const portNumber = parseInt(this.data.port + '', 10);
       const isPortInteger = (+this.data.port === portNumber);
-      if (!this.data.port) {
+      if (!this.data.port || portNumber < 1 || portNumber > 65535) {
         return this.util.showMessage('Invalid Port. The port must be a positive number in 1 - 65535.');
       }