diff --git a/device-caimito-16k-common.mk b/device-caimito-16k-common.mk
index 30a6f817..b1493a40 100644
--- a/device-caimito-16k-common.mk
+++ b/device-caimito-16k-common.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
+
 ifeq ($(TARGET_BOOTS_16K),true)
 # Configures the 16kb kernel directory.
 TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
@@ -38,3 +40,5 @@ BOARD_16K_OTA_USE_INCREMENTAL := true
 BOARD_16K_OTA_MOVE_VENDOR := true
 endif
 
+endif
+