diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index f65c43842..66478bd54 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -1017,9 +1017,7 @@ Temporary session not preserved."
 # Replace environment variable names with current value
 # and write to temp-file or return error from sed
 expand_ssl_config() {
-	if [ "$EASYRSA_FORCE_SAFE_SSL" ] || \
-		[ "$makesafeconf" ]
-	then
+	if [ "$EASYRSA_FORCE_SAFE_SSL" ]; then
 		# Always run
 		verbose "expand_ssl_config: FORCED"
 	elif [ "$working_safe_ssl_conf" ]; then
@@ -4889,7 +4887,6 @@ unset -v \
 	verify_ssl_lib_ok \
 	secured_session \
 	working_safe_ssl_conf working_safe_org_conf \
-	makesafeconf \
 	alias_days \
 	prohibit_no_pass \
 	invalid_vars \