diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index f6417fd946..b8af8c9120 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -29,10 +29,10 @@ endif
 ifeq ($(CONFIG_PAYLOAD_DEPTHCHARGE),y)
 PAYLOAD_CONFIG=payloads/external/depthcharge/depthcharge/.config
 $(PAYLOAD_CONFIG): payloads/external/depthcharge/depthcharge/build/depthcharge.elf
-ifneq ($(CONFIG_MAINBOARD_DEPTHCHARGE),)
-  BOARD=$(CONFIG_MAINBOARD_DEPTHCHARGE)
-else
+ifeq ($(call strip_quotes,$(CONFIG_MAINBOARD_DEPTHCHARGE))),)
   BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER))))
+else
+  BOARD=$(CONFIG_MAINBOARD_DEPTHCHARGE)
 endif
 #TODO: Figure out version
 endif