diff --git a/lib/load-config.js b/lib/load-config.js
index f4220b30f..4fe269fb5 100644
--- a/lib/load-config.js
+++ b/lib/load-config.js
@@ -4,6 +4,7 @@
 
 const Package = require('../package.json');
 let config;
+let isExampleConfig = false;
 const configPath = process.env.CRYPTPAD_CONFIG || "../config/config.js";
 try {
     config = require(configPath);
@@ -17,6 +18,7 @@ try {
         console.log("Config not found, loading the example config. You can customize the configuration by copying config/config.example.js to " + configPath);
     }
     config = require("../config/config.example");
+    isExampleConfig = true;
 }
 config.version = Package.version;
 
@@ -34,6 +36,15 @@ try {
         console.log("Config not found, loading the example config. You can customize the configuration by copying config/infra.example.js to " + infraPath);
     }
     infra = require("../config/infra.example");
+    if (!isExampleConfig) { // if config.js is provided but not infra.js
+        infra.public.origin = config.httpUnsafeOrigin || infra.public.origin;
+        infra.public.sandboxOrigin = config.httpSafeOrigin || infra.public.sandboxOrigin;
+        infra.public.httpHost = config.httpAddress || infra.public.httpHost;
+        infra.public.httpPort = config.httpPort || infra.public.httpPort;
+        infra.public.httpSafePort = config.httpSafePort || infra.public.httpSafePort;
+        infra.public.externalWebsocketURL = config.externalWebsocketURL || infra.public.externalWebsocketURL;
+        infra.public.fileHost = config.fileHost || infra.public.fileHost;
+    }
 }
 
 const isPositiveNumber = (n) => {