From e0805c125f27d192a18c25d4541f63028b5c511a Mon Sep 17 00:00:00 2001
From: lelemm <lelemm@gmail.com>
Date: Tue, 4 Mar 2025 17:26:45 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20for=20ACTUAL=5FPORT=20and?=
 =?UTF-8?q?=20PORT=20vars=20(#4537)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix for ACTUAL_PORT and PORT vars

* md
---
 packages/sync-server/src/load-config.js | 4 ++--
 upcoming-release-notes/4537.md          | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 upcoming-release-notes/4537.md

diff --git a/packages/sync-server/src/load-config.js b/packages/sync-server/src/load-config.js
index f57ae7841a..33871362fb 100644
--- a/packages/sync-server/src/load-config.js
+++ b/packages/sync-server/src/load-config.js
@@ -64,8 +64,8 @@ const configSchema = convict({
   port: {
     doc: 'Port to run the server on.',
     format: 'port',
-    default: 5006,
-    env: ['ACTUAL_PORT', 'PORT'],
+    default: process.env.PORT ? process.env.PORT : 5006,
+    env: 'ACTUAL_PORT',
   },
   hostname: {
     doc: 'Server hostname.',
diff --git a/upcoming-release-notes/4537.md b/upcoming-release-notes/4537.md
new file mode 100644
index 0000000000..cbeac5e6c4
--- /dev/null
+++ b/upcoming-release-notes/4537.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [lelemm]
+---
+
+Fix for ACTUAL_PORT and PORT vars
\ No newline at end of file