diff --git a/Makefile b/Makefile
index f9339c9145..23356bde6f 100644
--- a/Makefile
+++ b/Makefile
@@ -213,4 +213,8 @@ startdev-%:
 	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
 	$(eval DEVICE := $(word 3, $(subst -, , $@)))
 	${MAKE} prepare-${SYSTEM}
-	${MAKE} watch-$(SYSTEM)-$(DEVICE)
+	if [ -z "$(DEVICE)" ]; then \
+		${MAKE} watch-$(SYSTEM); \
+	else \
+		${MAKE} watch-$(SYSTEM)-$(DEVICE); \
+	fi