diff --git a/roles/etcd/templates/make-ssl-etcd.sh.j2 b/roles/etcd/templates/make-ssl-etcd.sh.j2
index d727cff7c..e0dde401d 100644
--- a/roles/etcd/templates/make-ssl-etcd.sh.j2
+++ b/roles/etcd/templates/make-ssl-etcd.sh.j2
@@ -100,4 +100,6 @@ if [ -e "$SSLDIR/ca-key.pem" ]; then
     rm -f ca.pem ca-key.pem
 fi
 
-mv *.pem ${SSLDIR}/
+if [ -n "$(ls -A *.pem)" ]; then
+    mv *.pem ${SSLDIR}/
+fi