diff --git a/docs/modules/hive/examples/getting_started/getting_started.sh b/docs/modules/hive/examples/getting_started/getting_started.sh
index 308ffb65..a2e7f682 100755
--- a/docs/modules/hive/examples/getting_started/getting_started.sh
+++ b/docs/modules/hive/examples/getting_started/getting_started.sh
@@ -96,9 +96,6 @@ exit 1
 ;;
 esac
 
-# TODO: Remove once https://github.com/stackabletech/issues/issues/828 has been implemented (see that issue for details).
-until kubectl get crd hiveclusters.hive.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Install HiveCluster"
 # tag::install-hive[]
 kubectl apply -f hive-minio-credentials.yaml
diff --git a/docs/modules/hive/examples/getting_started/getting_started.sh.j2 b/docs/modules/hive/examples/getting_started/getting_started.sh.j2
index b00719f6..82f4c628 100755
--- a/docs/modules/hive/examples/getting_started/getting_started.sh.j2
+++ b/docs/modules/hive/examples/getting_started/getting_started.sh.j2
@@ -96,9 +96,6 @@ exit 1
 ;;
 esac
 
-# TODO: Remove once https://github.com/stackabletech/issues/issues/828 has been implemented (see that issue for details).
-until kubectl get crd hiveclusters.hive.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Install HiveCluster"
 # tag::install-hive[]
 kubectl apply -f hive-minio-credentials.yaml