diff --git a/projects/demo/etcd/etcd.sh b/projects/demo/etcd/etcd.sh
index a2d6ad05e..8003145d9 100755
--- a/projects/demo/etcd/etcd.sh
+++ b/projects/demo/etcd/etcd.sh
@@ -29,3 +29,18 @@ NAME=infra${NUM}
     --initial-cluster-token etcd-cluster-1 \
     --initial-cluster infra200=http://${PREFIX}.200:2380,infra201=http://${PREFIX}.201:2380,infra202=http://${PREFIX}.202:2380 \
     --initial-cluster-state new
+
+echo "Returned $?"
+
+# If we get here, joining a new cluster failed. Let's try joining an
+# existing cluster
+/usr/local/bin/etcd \
+    --name ${NAME} \
+    --debug \
+    --log-package-levels etcdmain=DEBUG,etcdserver=DEBUG \
+    --initial-advertise-peer-urls http://${IP}:2380 \
+    --listen-peer-urls http://${IP}:2380 \
+    --listen-client-urls http://${IP}:2379,http://127.0.0.1:2379 \
+    --advertise-client-urls http://${IP}:2379 \
+    --initial-cluster infra200=http://${PREFIX}.200:2380,infra201=http://${PREFIX}.201:2380,infra202=http://${PREFIX}.202:2380 \
+    --initial-cluster-state existing