diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 163ed06..978a696 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -286,10 +286,10 @@
     juju config -m $MODEL_NAME prometheus site_url=https://prometheus.${API_SERVER}.nip.io
 
     echo "Waiting for deployment to finish..."
+    check_osm_deployed
     grafana_leader=`juju status -m $MODEL_NAME grafana | grep "*" | cut -d "*" -f 1`
     grafana_admin_password=`juju run -m $MODEL_NAME --unit $grafana_leader "echo \\$GF_SECURITY_ADMIN_PASSWORD"`
     juju config -m $MODEL_NAME mon grafana_password=$grafana_admin_password
-    check_osm_deployed
     echo "OSM with charms deployed"
 }