diff --git a/start-mailserver.sh b/start-mailserver.sh
index 5354a56c..04030b83 100644
--- a/start-mailserver.sh
+++ b/start-mailserver.sh
@@ -141,10 +141,12 @@ fi
 case $DMS_SSL in
   "letsencrypt" )
     # letsencrypt folders and files mounted in /etc/letsencrypt
-      # add eol to all files before concatenation
-      sed -i -e '$a\' /etc/letsencrypt/live/$(hostname)/cert.pem
-      sed -i -e '$a\' /etc/letsencrypt/live/$(hostname)/chain.pem
-      sed -i -e '$a\' /etc/letsencrypt/live/$(hostname)/privkey.pem
+    if [ -e "/etc/letsencrypt/live/$(hostname)/cert.pem" ] \
+    && [ -e "/etc/letsencrypt/live/$(hostname)/chain.pem" ] \
+    && [ -e "/etc/letsencrypt/live/$(hostname)/privkey.pem" ]; then
+      echo "Adding $(hostname) SSL certificate"
+      # create combined.pem from (cert|chain|privkey).pem with eol after each .pem
+      sed -e '$a\' -s /etc/letsencrypt/live/$(hostname)/{cert,chain,privkey}.pem > /etc/letsencrypt/live/$(hostname)/combined.pem
 
       # Postfix configuration
       sed -i -r 's/smtpd_tls_cert_file=\/etc\/ssl\/certs\/ssl-cert-snakeoil.pem/smtpd_tls_cert_file=\/etc\/letsencrypt\/live\/'$(hostname)'\/fullchain.pem/g' /etc/postfix/main.cf
@@ -156,6 +158,7 @@ case $DMS_SSL in
 
       echo "SSL configured with letsencrypt certificates"
 
+    fi
     ;;
 
   "custom" )