diff --git a/runner/src/dml-handler/dml-handler.ts b/runner/src/dml-handler/dml-handler.ts
index 8d2a47965..dae32c921 100644
--- a/runner/src/dml-handler/dml-handler.ts
+++ b/runner/src/dml-handler/dml-handler.ts
@@ -21,7 +21,7 @@ export default class DmlHandler {
       user: databaseConnectionParameters.username,
       password: databaseConnectionParameters.password,
       host: process.env.PGHOST,
-      port: Number(databaseConnectionParameters.port),
+      port: Number(process.env.PGPORT ?? databaseConnectionParameters.port),
       database: databaseConnectionParameters.database,
     });
     return new DmlHandler(pgClient);