diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup
index f27d77df5120..5d32dbd2bcb1 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup
@@ -4,12 +4,10 @@
 
 cd /sys/kernel/config/usb_gadget
 
-cd adb
+cd adb || exit 0
 
 echo -n "" > UDC || true
 
-killall adbd || true
-
 umount /dev/usb-ffs/adb
 
 rm configs/c.1/ffs.usb0