diff --git a/docker/run.sh b/docker/run.sh
index 007394d280..2035e20fa6 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -107,6 +107,8 @@ docker run \
     ${SHARE_PAPARAZZI_HOME_OPTS} \
     --rm $args
 
+# remember exit status
+EXIT_STATUS=$?
 
 ############################################################
 # cleanup after exiting from docker container
@@ -119,3 +121,5 @@ rm -f $XAUTH
 if [ $UNAME == "Darwin" ]; then
     pkill -f "$TCPPROXY"
 fi
+
+exit $EXIT_STATUS