diff --git a/ROMFS/CMakeLists.txt b/ROMFS/CMakeLists.txt
index 460c33b51a7f275714c52e00b74d7e287a9608ed..fb24883fbf854bfbf6673234984293e0d65abc54 100644
--- a/ROMFS/CMakeLists.txt
+++ b/ROMFS/CMakeLists.txt
@@ -196,6 +196,7 @@ if(SHELLCHECK_PATH)
 			--exclude=SC2086 # SC2086: Double quote to prevent globbing and word splitting.
 			--exclude=SC2166 # SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined.
 			--exclude=SC2154 # SC2154: <var> is referenced but not assigned (NuttX uses different asssignment)
+			--exclude=SC2164 # SC2164: Use 'cd ... || exit' or 'cd ... || return' in case cd fails.
 			`find ${romfs_gen_root_dir}/init.d -type f`
 		DEPENDS ${romfs_gen_root_dir}/init.d/rc.autostart
 		WORKING_DIRECTORY ${romfs_gen_root_dir}
diff --git a/Tools/px4airframes/rcout.py b/Tools/px4airframes/rcout.py
index c9d79723d3fed901fd2498428cf67f2e0d090f5f..4b0db3c405d892009e1006aba00ce11378c3befb 100644
--- a/Tools/px4airframes/rcout.py
+++ b/Tools/px4airframes/rcout.py
@@ -30,7 +30,7 @@ class RCOutput():
                     "# 14000 ..  14999       Tri Y\n"
                     ""
                     ""
-                    "cd /etc/init.d/airframes || return\n"
+                    "cd /etc/init.d/airframes\n"
                     "\n")
         for group in groups:
             result += "# GROUP: %s\n\n" % group.GetName()