diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/serviceinfo/SMPEndpoint.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/serviceinfo/SMPEndpoint.java
index 88cc596a6..e28cc6eb6 100644
--- a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/serviceinfo/SMPEndpoint.java
+++ b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/domain/serviceinfo/SMPEndpoint.java
@@ -204,7 +204,8 @@ public com.helger.xsds.peppol.smp1.EndpointType getAsJAXBObjectPeppol ()
     ret.setCertificate (CertificateHelper.getRFC1421CompliantString (m_sCertificate, false, "\n"));
     ret.setServiceDescription (m_sServiceDescription);
     ret.setTechnicalContactUrl (m_sTechnicalContactUrl);
-    ret.setTechnicalInformationUrl (m_sTechnicalInformationUrl);
+    if (StringHelper.hasText (m_sTechnicalInformationUrl))
+      ret.setTechnicalInformationUrl (m_sTechnicalInformationUrl);
     ret.setExtension (getExtensions ().getAsPeppolExtension ());
     ret.setTransportProfile (m_sTransportProfile);
     return ret;