diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9fd1bb6..f483f7c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,8 @@ Version counting is based on semantic versioning (Major.Feature.Patch)
 ### YACReaderLibrary
 * Fix scroll in grid views when using Qt6 builds.
 * Fix deleting metadata from comics also deleted the number of pages info.
-* Use https://github.com/nayuki/QR-Code-generator instead of libqrencode for QR code generation
+* Use https://github.com/nayuki/QR-Code-generator instead of libqrencode for QR code generation.
+* Do not accept empty values for the server port in the server settings dialog.
 
 ### Server
 * New search API that exposes the search engine.
diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp
index c15902bc..4a11b4be 100644
--- a/YACReaderLibrary/server_config_dialog.cpp
+++ b/YACReaderLibrary/server_config_dialog.cpp
@@ -58,6 +58,10 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent)
 
     port = new QLineEdit("8080", this);
     port->setReadOnly(false);
+
+    connect(port, &QLineEdit::textChanged, this, [=](const QString &portValue) {
+        accept->setEnabled(!portValue.isEmpty());
+    });
     // port->setFixedWidth(100);
     // port->move(332, 244);