diff --git a/.config/redis.config.php b/.config/redis.config.php
index 2069812f..66a13d43 100644
--- a/.config/redis.config.php
+++ b/.config/redis.config.php
@@ -5,6 +5,7 @@ if (getenv('REDIS_HOST')) {
     'memcache.locking' => '\OC\Memcache\Redis',
     'redis' => array(
       'host' => getenv('REDIS_HOST'),
+      if (getenv('REDIS_HOST_USER')) { 'user' => getenv('REDIS_HOST_USER'), }
       'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
     ),
   );
@@ -14,8 +15,4 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
-
-  if (getenv('REDIS_HOST_USER') !== false) {
-    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
-  }
 }