diff --git a/stack.sh b/stack.sh
index 1f3af45871..974b2cf804 100755
--- a/stack.sh
+++ b/stack.sh
@@ -697,6 +697,8 @@ fi
 if is_service_enabled swift; then
     setup_develop $SWIFT_DIR
     setup_develop $SWIFTCLIENT_DIR
+fi
+if is_service_enabled swift3; then
     setup_develop $SWIFT3_DIR
 fi
 if is_service_enabled g-api n-api; then