diff --git a/board/common/overlay/etc/motioneye.conf b/board/common/overlay/etc/motioneye.conf
index 8a58cf6b7c..fb0e57f973 100644
--- a/board/common/overlay/etc/motioneye.conf
+++ b/board/common/overlay/etc/motioneye.conf
@@ -2,7 +2,7 @@ conf_path /data/etc
 run_path /tmp
 log_path /var/log
 media_path /data/output
-motion_binary /usr/bin/motion-mrdave
+motion_binary /usr/bin/motion
 log_level info
 listen 0.0.0.0
 port 80
diff --git a/board/common/overlay/usr/bin/motion b/board/common/overlay/usr/bin/motion
index 0d43df96a0..aaad5bcba4 100755
--- a/board/common/overlay/usr/bin/motion
+++ b/board/common/overlay/usr/bin/motion
@@ -7,5 +7,5 @@ motion=$MOTION_MRDAVE
 
 echo "using motion binary $motion"
 
-exec $motion "$*"
+exec $motion "$@"
 
diff --git a/board/raspberrypi/overlay/usr/bin/motion b/board/raspberrypi/overlay/usr/bin/motion
index c3784d3c6b..1244c595cc 100755
--- a/board/raspberrypi/overlay/usr/bin/motion
+++ b/board/raspberrypi/overlay/usr/bin/motion
@@ -5,7 +5,7 @@ MOTION_MRDAVE="/usr/bin/motion-mrdave"
 MOTION_MMAL="/usr/bin/motion-mmal"
 
 if [ "$1" == "-h" ]; then
-    # when asked about version , always report MrDave's,
+    # when asked about version, always report MrDave's,
     # as it's the most featureful one
     motion=$MOTION_MRDAVE
 
@@ -32,5 +32,5 @@ fi
 
 echo "using motion binary $motion"
 
-exec $motion "$*"
+exec $motion "$@"
 
diff --git a/board/raspberrypi2/overlay/usr/bin/motion b/board/raspberrypi2/overlay/usr/bin/motion
index c3784d3c6b..1244c595cc 100755
--- a/board/raspberrypi2/overlay/usr/bin/motion
+++ b/board/raspberrypi2/overlay/usr/bin/motion
@@ -5,7 +5,7 @@ MOTION_MRDAVE="/usr/bin/motion-mrdave"
 MOTION_MMAL="/usr/bin/motion-mmal"
 
 if [ "$1" == "-h" ]; then
-    # when asked about version , always report MrDave's,
+    # when asked about version, always report MrDave's,
     # as it's the most featureful one
     motion=$MOTION_MRDAVE
 
@@ -32,5 +32,5 @@ fi
 
 echo "using motion binary $motion"
 
-exec $motion "$*"
+exec $motion "$@"