diff --git a/configuration/buildAndUpdateProduct.sh b/configuration/buildAndUpdateProduct.sh
index b89374cd970..aa10ad3e044 100755
--- a/configuration/buildAndUpdateProduct.sh
+++ b/configuration/buildAndUpdateProduct.sh
@@ -726,7 +726,21 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
     
         # make sure to honour the service configuration
         # needed to make sure that tests use the right servers
-        APP_PARAMETERS="-Dmongo.host=$MONGODB_HOST -Dmongo.port=$MONGODB_PORT -Dexpedition.udp.port=$EXPEDITION_PORT -Dreplication.exchangeHost=$REPLICATION_HOST -Dreplication.exchangeName=$REPLICATION_CHANNEL ${APP_PARAMETERS}"
+        if [ -n "${MONGODB_HOST}" ]; then
+          APP_PARAMETERS="-Dmongo.host=${MONGODB_HOST} ${APP_PARAMETERS}"
+        fi
+        if [ -n "${MONGODB_PORT}" ]; then
+          APP_PARAMETERS="-Dmongo.port=${MONGODB_PORT} ${APP_PARAMETERS}"
+        fi
+        if [ -n "${EXPEDITION_PORT}" ]; then
+          APP_PARAMETERS="-Dexpedition.udp.port=${EXPEDITION_PORT} ${APP_PARAMETERS}"
+        fi
+        if [ -n "${REPLICATION_HOST}" ]; then
+          APP_PARAMETERS="-Dreplication.exchangeHost=${REPLICATION_HOST} ${APP_PARAMETERS}"
+        fi
+        if [ -n "${REPLICATION_CHANNEL}" ]; then
+          APP_PARAMETERS="-Dreplication.exchangeName=${REPLICATION_CHANNEL} ${APP_PARAMETERS}"
+        fi
     
         extra="$extra -P with-not-android-relevant,!with-mobile"