diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk
index ef54bbbf..0a405a3f 100644
--- a/BoardConfig-16k-common.mk
+++ b/BoardConfig-16k-common.mk
@@ -14,8 +14,6 @@
 # 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
@@ -48,5 +46,3 @@ BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(
 BOARD_16K_OTA_USE_INCREMENTAL := true
 BOARD_16K_OTA_MOVE_VENDOR := true
 endif
-
-endif
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 492ce71d..d51c98dc 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -17,7 +17,9 @@ include build/make/target/board/BoardConfigMainlineCommon.mk
 include build/make/target/board/BoardConfigPixelCommon.mk
 
 # Include settings for 16k developer option, if enabled
+ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
 include device/google/zuma/BoardConfig-16k-common.mk
+endif
 
 # HACK : To fix up after bring up multimedia devices.
 TARGET_SOC := zuma