diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index c0ef748ce81c..2185faebe6dd 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -123,6 +123,14 @@ for _line in ${dp_RAWDEPENDS} ; do
 		continue
 	fi
 
+	case "${origin}" in
+	*@*/*) ;; # Ignore @ in the path which would not be a flavor
+	*@*)
+		export FLAVOR="${origin##*@}"
+		origin=${origin%@*}
+		;;
+	esac
+
 	case "${origin}" in
 	/*) ;;
 	*)
@@ -135,13 +143,6 @@ for _line in ${dp_RAWDEPENDS} ; do
 		origin="${orig}"
 		;;
 	esac
-	case "${origin}" in
-	*@*/*) ;; # Ignore @ in the path which would not be a flavor
-	*@*)
-		export FLAVOR="${origin##*@}"
-		origin=${origin%@*}
-		;;
-	esac
 
 	depends_args="${dp_DEPENDS_ARGS}"
 	target=${dp_DEPENDS_TARGET}