diff --git a/internal/config/config.go b/internal/config/config.go
index c68cd54..b63128c 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -22,9 +22,10 @@ type Config struct {
 }
 
 func LoadConfig() *Config {
+	port := getEnv("SERVER_PORT", "8765")
 	return &Config{
-		ServerPort:        getEnv("SERVER_PORT", "8080"),
-		BaseURL:           getEnv("BASE_URL", "http://localhost:8080"),
+		ServerPort:        port,
+		BaseURL:           getEnv("BASE_URL", "http://localhost:"+port),
 		DatabaseHost:      getEnv("DATABASE_HOST", "localhost"),
 		DatabasePort:      getEnv("DATABASE_PORT", "5432"),
 		DatabaseUser:      getEnv("DATABASE_USER", "postgres"),