diff --git a/deploy.sh b/deploy.sh
index e3c55c9da36d1a8c2b39d5fffa190ac5e42d7580..b0bd374422820be5b3cb88dbf096a1fd037bf14e 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -190,7 +190,17 @@ for EXTRA_MANIFEST in $TFS_EXTRA_MANIFESTS; do
     printf "\n"
 done
 
-# By now, leave this control here. Some component dependencies are not well handled
+# By now, leave these controls here. Some component dependencies are not well handled.
+
+if [[ "$TFS_COMPONENTS" == *"monitoring"* ]]; then
+    echo "Waiting for 'MonitoringDB' component..."
+    # Kubernetes does not implement --for='condition=available' for statefulsets.
+    # By now, we assume a single replica of monitoringdb. To be updated in future releases.
+    kubectl wait --namespace $TFS_K8S_NAMESPACE \
+        --for=jsonpath='{.status.readyReplicas}'=1 --timeout=300s statefulset/monitoringdb
+    printf "\n"
+fi
+
 for COMPONENT in $TFS_COMPONENTS; do
     echo "Waiting for '$COMPONENT' component..."
     kubectl wait --namespace $TFS_K8S_NAMESPACE \