diff --git a/app/routes.js b/app/routes.js
index 9e2f3f7deb692304bcb15927e4371929d1276966..ac5d18a23b7e983af53011313e0a8774c23d9240 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -35,7 +35,10 @@ module.exports = function (app, redirect, config, proxyServer, proxyRouter, k8,
       for (var x in obj) { return false; }
       return true;
     }
-    extraArgs = Object.assign({},req.query)
+    var query = {}
+    if (cconf.entryPoint.replacementsFromQueryParameters)
+      query = req.query
+    extraArgs = Object.assign({},query)
     if (!isEmpty(extraArgs) && !extraArgs.imageSubtype)
       extraArgs.imageSubtype = `custom${compactSha.objectSha(extraArgs, prefix='').replace(/[-_]/g,'').slice(0,5).toLowerCase()}`
     extraArgs.path = req.url
diff --git a/config/default.hjson b/config/default.hjson
index f9b18359dc407291cc6d0e60d278ac2e6670a2c7..7ee3c52ccaab888cb00675bfdee7c855bc065df8 100644
--- a/config/default.hjson
+++ b/config/default.hjson
@@ -77,6 +77,7 @@ k8component: {
     redirectTarget: "{{prefix}}/"
     execCommand: []
     exclusiveStartPoint: false
+    replacementsFromQueryParameters: true
   }
   commands: {
     path: "{{prefix}}/cM"