1 files changed, 4 insertions, 2 deletions

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index dae8c07e3e..0df95342f9 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -474,8 +474,10 @@ ifneq ($(wildcard $(QMK_USERSPACE)),)
 endif
 
 # If the equivalent users directory exists in userspace, use that in preference to anything currently in the main repo
-ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),)
-    USER_PATH := $(QMK_USERSPACE)/$(USER_PATH)
+ifneq ($(QMK_USERSPACE),)
+        ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),)
+        USER_PATH := $(QMK_USERSPACE)/$(USER_PATH)
+        endif
 endif
 
 # Pull in user level rules.mk