diff --git a/builddefs/xap.mk b/builddefs/xap.mk
index f08d774297f..a0c0dc38ed0 100644
--- a/builddefs/xap.mk
+++ b/builddefs/xap.mk
@@ -1,12 +1,6 @@
 # Copyright 2022 Nick Brassel (@tzarc)
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# XAP embedded info.json
-$(KEYMAP_OUTPUT)/src/info_json_gz.h: $(INFO_JSON_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) xap-generate-info-h -o "$(KEYMAP_OUTPUT)/src/info_json_gz.h" -kb $(KEYBOARD) -km $(KEYMAP))
-	@$(BUILD_CMD)
-
 XAP_FILES := $(shell ls -1 data/xap/* | sort | xargs echo)
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/xap.hjson)","")
 	XAP_FILES += $(KEYBOARD_PATH_1)/xap.hjson
@@ -27,6 +21,11 @@ ifneq ("$(wildcard $(KEYMAP_PATH)/xap.hjson)","")
 	XAP_FILES += $(KEYMAP_PATH)/xap.hjson
 endif
 
+$(KEYMAP_OUTPUT)/src/info_json_gz.h: $(INFO_JSON_FILES)
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) xap-generate-info-h -o "$(KEYMAP_OUTPUT)/src/info_json_gz.h" -kb $(KEYBOARD) -km $(KEYMAP))
+	@$(BUILD_CMD)
+
 $(KEYMAP_OUTPUT)/src/xap_generated.inl: $(XAP_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) xap-generate-qmk-inc -o "$(KEYMAP_OUTPUT)/src/xap_generated.inl" -kb $(KEYBOARD) -km $(KEYMAP))