diff --git a/acme.sh b/acme.sh
index 001ef04b..303da6f1 100755
--- a/acme.sh
+++ b/acme.sh
@@ -824,17 +824,17 @@ _initpath() {
     ACCOUNT_KEY_PATH="$_DEFAULT_ACCOUNT_KEY_PATH"
   fi
   
+  _DEFAULT_CERT_HOME="$LE_WORKING_DIR"
+  if [ -z "$CERT_HOME" ] ; then
+    CERT_HOME="$_DEFAULT_CERT_HOME"
+  fi
+
   domain="$1"
 
   if [ -z "$domain" ] ; then
     return 0
   fi
   
-  _DEFAULT_CERT_HOME="$LE_WORKING_DIR"
-  if [ -z "$CERT_HOME" ] ; then
-    CERT_HOME="$_DEFAULT_CERT_HOME"
-  fi
-
   domainhome="$CERT_HOME/$domain"
   mkdir -p "$domainhome"