diff --git a/store/crd/init.go b/store/crd/init.go
index 09b351e3..7e787c74 100644
--- a/store/crd/init.go
+++ b/store/crd/init.go
@@ -135,7 +135,7 @@ func (f *Factory) waitCRD(ctx context.Context, apiClient clientset.Interface, cr
 	defer logrus.Infof("Done waiting for CRD %s to become available", crdName)
 
 	first := true
-	return wait.Poll(500*time.Millisecond, 60*time.Second, func() (bool, error) {
+	return wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 60*time.Second, false, func(ctx context.Context) (bool, error) {
 		if !first {
 			logrus.Infof("Waiting for CRD %s to become available", crdName)
 		}