diff --git a/s3.sh b/s3.sh
index 6e1d6ed..b7ea9ac 100755
--- a/s3.sh
+++ b/s3.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+if [[ ! -z "${TUNASYNC_S3_ENDPOINT}" ]]; then
+	ENDPOINT="--endpoint-url=${TUNASYNC_S3_ENDPOINT}"
+else
+	ENDPOINT=""
+fi
+
 [[ ! -d "${TUNASYNC_WORKING_DIR}" ]] && mkdir -p "${TUNASYNC_WORKING_DIR}"
 mkdir /tmp/none; cd /tmp/none # enter an empty folder, so the stars in TUNASYNC_AWS_OPTIONS are not expanded
-exec aws --no-sign-request --endpoint-url="${TUNASYNC_S3_ENDPOINT}" s3 sync ${TUNASYNC_AWS_OPTIONS} "${TUNASYNC_UPSTREAM_URL}" "${TUNASYNC_WORKING_DIR}"
+exec aws --no-sign-request ${ENDPOINT} s3 sync ${TUNASYNC_AWS_OPTIONS} "${TUNASYNC_UPSTREAM_URL}" "${TUNASYNC_WORKING_DIR}"
+