diff --git a/app/Livewire/Project/Database/Redis/General.php b/app/Livewire/Project/Database/Redis/General.php
index ab9b0756d..20a881523 100644
--- a/app/Livewire/Project/Database/Redis/General.php
+++ b/app/Livewire/Project/Database/Redis/General.php
@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
+use App\Models\EnvironmentVariable;
 use App\Models\Server;
 use App\Models\StandaloneRedis;
 use Exception;
@@ -144,6 +145,14 @@ public function render()
         return view('livewire.project.database.redis.general');
     }
 
+    public function isSharedVariable($name)
+    {
+        return EnvironmentVariable::where('key', $name)
+            ->where('standalone_redis_id', $this->database->id)
+            ->where('is_shared', true)
+            ->exists();
+    }
+
     private function updateEnvironmentVariable($key, $value)
     {
         $envVar = $this->database->runtime_environment_variables()
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index e71eacc45..188982f47 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -21,7 +21,7 @@ class StandaloneRedis extends BaseModel
     ];
 
     protected $attributes = [
-        'redis_username' => 'redis',
+        'redis_username' => 'default',
     ];
 
     protected static function booted()
@@ -220,7 +220,8 @@ protected function internalDbUrl(): Attribute
         return new Attribute(
             get: function () {
                 $redis_version = $this->get_redis_version();
-                $username_part = version_compare($redis_version, '6.0', '>=') ? "{$this->redis_username}:" : "";
+                $username_part = version_compare($redis_version, '6.0', '>=') ? "{$this->redis_username}:" : '';
+
                 return "redis://{$username_part}{$this->redis_password}@{$this->uuid}:6379/0";
             }
         );
@@ -232,9 +233,11 @@ protected function externalDbUrl(): Attribute
             get: function () {
                 if ($this->is_public && $this->public_port) {
                     $redis_version = $this->get_redis_version();
-                    $username_part = version_compare($redis_version, '6.0', '>=') ? "{$this->redis_username}:" : "";
+                    $username_part = version_compare($redis_version, '6.0', '>=') ? "{$this->redis_username}:" : '';
+
                     return "redis://{$username_part}{$this->redis_password}@{$this->destination->server->getIp}:{$this->public_port}/0";
                 }
+
                 return null;
             }
         );
@@ -243,6 +246,7 @@ protected function externalDbUrl(): Attribute
     private function get_redis_version()
     {
         $image_parts = explode(':', $this->image);
+
         return $image_parts[1] ?? '0.0';
     }
 
@@ -309,9 +313,9 @@ public function getMetrics(int $mins = 5)
             return $parsedCollection->toArray();
         }
     }
+
     public function isBackupSolutionAvailable()
     {
         return false;
     }
 }
-
diff --git a/resources/views/livewire/project/database/redis/general.blade.php b/resources/views/livewire/project/database/redis/general.blade.php
index c5ab13d94..e61c210b0 100644
--- a/resources/views/livewire/project/database/redis/general.blade.php
+++ b/resources/views/livewire/project/database/redis/general.blade.php
@@ -16,11 +16,22 @@
                 $redis_version = explode(':', $database->image)[1] ?? '0.0';
             @endphp
             @if (version_compare($redis_version, '6.0', '>='))
-                <x-forms.input label="Username" id="database.redis_username" required helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work. <br><br>
-                <strong>Warning:</strong> If you have set a REDIS_USERNAME environment variable in the Environment Variables tab (team variable or otherwise), and change the Value here in the UI field, the change will be overwritten by the REDIS_USERNAME environment variable value." />
+                <x-forms.input label="Username" id="database.redis_username" required 
+                    helper="You can change the Redis Username in the input field below or by editing the value of the REDIS_USERNAME environment variable.
+                    <br><br>
+                    If you change the Redis Username in the database, please sync it here, otherwise automations (like backups) won't work. 
+                    <br><br>
+                    Note: If the environment variable REDIS_USERNAME is set as a shared variable (environment, project, or team-based), this input field will become read-only."
+                    :disabled="$this->isSharedVariable('REDIS_USERNAME')" />
             @endif
-            <x-forms.input label="Password" id="database.redis_password" type="password" required helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work. <br><br>
-            <strong>Warning:</strong> If you have set a REDIS_PASSWORD environment variable in the Environment Variables tab (team variable or otherwise), and change the Value here in the UI field, the change will be overwritten by the REDIS_PASSWORD environment variable value." wire:model.defer="database.redis_password" />
+            <x-forms.input label="Password" id="database.redis_password" type="password" required 
+                helper="You can change the Redis Password in the input field below or by editing the value of the REDIS_PASSWORD environment variable.
+                <br><br>
+                If you change the Redis Password in the database, please sync it here, otherwise automations (like backups) won't work.
+                <br><br>
+                Note: If the environment variable REDIS_PASSWORD is set as a shared variable (environment, project, or team-based), this input field will become read-only."
+                wire:model.defer="database.redis_password"
+                :disabled="$this->isSharedVariable('REDIS_PASSWORD')" />
         </div>
         <x-forms.input
             helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"