diff --git a/lib/remote/endpoint.cpp b/lib/remote/endpoint.cpp
index 29068ac0d..bdbfed088 100644
--- a/lib/remote/endpoint.cpp
+++ b/lib/remote/endpoint.cpp
@@ -57,6 +57,14 @@ void Endpoint::OnAllConfigLoaded(void)
 		BOOST_THROW_EXCEPTION(ScriptError("Endpoint '" + GetName() + "' does not belong to a zone.", GetDebugInfo()));
 }
 
+void Endpoint::ValidatePort(const String& value, const ValidationUtils& utils)
+{
+	ObjectImpl<Endpoint>::ValidatePort(value, utils);
+
+	if (value.IsEmpty())
+		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("enpoint_port"), "Port may not be empty."));
+}
+
 void Endpoint::AddClient(const JsonRpcConnection::Ptr& client)
 {
 	bool was_master = ApiListener::GetInstance()->IsMaster();
diff --git a/lib/remote/endpoint.hpp b/lib/remote/endpoint.hpp
index 0738572fe..cd8aac117 100644
--- a/lib/remote/endpoint.hpp
+++ b/lib/remote/endpoint.hpp
@@ -56,6 +56,7 @@ public:
 
 protected:
 	virtual void OnAllConfigLoaded(void) override;
+	virtual void ValidatePort(const String& value, const ValidationUtils& utils) override;
 
 private:
 	mutable boost::mutex m_ClientsLock;