diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b7847138e..fc94a736c 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -72,6 +72,10 @@ run_service() {
     wait-for-tcp "${PULP_DB_HOST:-localhost}" "${PULP_DB_PORT:-5432}"
     wait-for-tcp "${PULP_REDIS_HOST:-localhost}" "${PULP_REDIS_PORT:-6379}"
 
+    # TODO: remove once Pulp recognizes REDIS_SSL parameter when building 
+    # settings for RQ in pulpcore/rqconfig.py
+    redis_connection_hack
+
     if [[ "$WITH_DEV_INSTALL" -eq "1" ]]; then
         install_local_deps
     fi
@@ -97,13 +101,13 @@ run_manage() {
 
 
 redis_connection_hack() {
-    if [[ "$PULP_REDIS_SSL" == "true" ]]; then
+    if [[ ${PULP_REDIS_SSL:-false} = "true" ]]; then
         protocol="rediss://"
     else
         protocol="redis://"
     fi
 
-    if [[ -z "$PULP_REDIS_PASSWORD" ]]; then
+    if [[ -z "${PULP_REDIS_PASSWORD:-}" ]]; then
         password=""
     else
         password=":${PULP_REDIS_PASSWORD}@"
@@ -119,9 +123,6 @@ main() {
         exec "/bin/bash"
     fi
 
-    # TODO: remove once Pulp recognizes REDIS_SSL parameter when building settings for RQ in pulpcore/rqconfig.py
-    redis_connection_hack
-
     case "$1" in
         'run')
             run_service "${@:2}"