diff --git a/modules/ppcp-vaulting/src/VaultingModule.php b/modules/ppcp-vaulting/src/VaultingModule.php
index 1d2ed2fe2..7ed0b2c86 100644
--- a/modules/ppcp-vaulting/src/VaultingModule.php
+++ b/modules/ppcp-vaulting/src/VaultingModule.php
@@ -60,8 +60,13 @@ class VaultingModule implements ModuleInterface {
 		add_action(
 			'woocommerce_paypal_payments_gateway_migrate',
 			function () {
-				add_rewrite_endpoint( 'ppcp-paypal-payment-tokens', EP_PAGES );
-				flush_rewrite_rules();
+				add_action(
+					'init',
+					function () {
+						add_rewrite_endpoint( 'ppcp-paypal-payment-tokens', EP_PAGES );
+						flush_rewrite_rules();
+					}
+				);
 			}
 		);