diff --git a/docs/modules/hbase/examples/getting_started/getting_started.sh b/docs/modules/hbase/examples/getting_started/getting_started.sh
index ec714998..66055822 100755
--- a/docs/modules/hbase/examples/getting_started/getting_started.sh
+++ b/docs/modules/hbase/examples/getting_started/getting_started.sh
@@ -51,9 +51,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 hbaseclusters.hbase.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Creating ZooKeeper cluster"
 # tag::install-zk[]
 kubectl apply -f zk.yaml
diff --git a/docs/modules/hbase/examples/getting_started/getting_started.sh.j2 b/docs/modules/hbase/examples/getting_started/getting_started.sh.j2
index 95009d78..f33e5355 100755
--- a/docs/modules/hbase/examples/getting_started/getting_started.sh.j2
+++ b/docs/modules/hbase/examples/getting_started/getting_started.sh.j2
@@ -51,9 +51,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 hbaseclusters.hbase.stackable.tech >/dev/null 2>&1; do echo "Waiting for CRDs to be installed" && sleep 1; done
-
 echo "Creating ZooKeeper cluster"
 # tag::install-zk[]
 kubectl apply -f zk.yaml