diff --git a/labs/scripts/setup_cinder_controller.sh b/labs/scripts/setup_cinder_controller.sh
index d7045c64..a263ccc1 100755
--- a/labs/scripts/setup_cinder_controller.sh
+++ b/labs/scripts/setup_cinder_controller.sh
@@ -104,6 +104,11 @@ sudo service cinder-api restart
 # Verify the Block Storage installation
 #------------------------------------------------------------------------------
 
+echo "Waiting for cinder to start."
+until cinder list >/dev/null 2>&1; do
+    sleep 1
+done
+
 echo "cinder create --display-name labsVolume 1"
 cinder create --display-name labsVolume 1