diff --git a/.env.example b/.env.example
index 7bb64d392..f574b28e7 100644
--- a/.env.example
+++ b/.env.example
@@ -38,7 +38,8 @@ ENABLE_ACCOUNT_SIGNUP=false
 # specify the configs via single URL or individual variables
 # ref: https://www.iana.org/assignments/uri-schemes/prov/redis
 # You can also use the following format for the URL: redis://:password@host:port/db_number
-REDIS_URL=redis://redis:6379
+# Note: Port 6380 is used instead of default 6379 to avoid conflicts with Gitea if running on same server
+REDIS_URL=redis://redis:6380
 # If you are using docker-compose, set this variable's value to be any string,
 # which will be the password for the redis service running inside the docker-compose
 # to make it secure
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index ed63769a6..15d460e39 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -56,7 +56,7 @@ services:
     volumes:
       - redis_data:/data
     ports:
-      - '127.0.0.1:6379:6379'
+      - '127.0.0.1:6380:6379'
 
 volumes:
   storage_data:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ed63769a6..15d460e39 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -56,7 +56,7 @@ services:
     volumes:
       - redis_data:/data
     ports:
-      - '127.0.0.1:6379:6379'
+      - '127.0.0.1:6380:6379'
 
 volumes:
   storage_data: