diff --git a/xbps-src b/xbps-src
index 53fecd9bb46..b3f61d53dc4 100755
--- a/xbps-src
+++ b/xbps-src
@@ -536,6 +536,8 @@ fi
 # unless in a container for simplicity of container/CI usage
 if [ "$XBPS_CHROOT_CMD" = ethereal ]; then
     : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir}"
+elif [ -n "$XBPS_ARG_MASTERDIR" ]; then
+    : # Don't mess with masterdir in argv
 else
     : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir-$XBPS_MACHINE}"
     # but use $XBPS_DISTDIR/masterdir if it exists and the new style doesn't