diff --git a/run/scripts/run b/run/scripts/run
index 8eea159115267329d54135c882b6fdbbb54491ff..899093b4dc4850e3f9f002baccf84760cd8dd557 100755
--- a/run/scripts/run
+++ b/run/scripts/run
@@ -10,4 +10,4 @@ if [[ -n "$1" ]]; then
   fi
 fi
 
-/usr/local/bin/${COMMAND} $@
+/usr/local/bin/${COMMAND} "$@"
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 03ba4fb136cb8aba2118a3a7b7c58184b02e2925..00af88b177a3a4dc0c95973629c8dbeeb6f7ac9a 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -101,4 +101,4 @@ project_params=(
 docker exec -it \
   "${project_params[@]}" \
   l3drun \
-  /usr/local/bin/run $@
+  /usr/local/bin/run "$@"