diff --git a/bootstrap.php b/bootstrap.php
index f1e14c6..114c1be 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -35,7 +35,7 @@ function () {
 
 	// Late hooks
 	add_action(
-		'plugins_loaded',
+		'after_setup_theme',
 		function () {
 			if ( 'atomic' === getContext( 'platform' ) ) {
 
@@ -54,8 +54,10 @@ function () {
 					array( 'NewfoldLabs\WP\Module\Onboarding\LoginRedirect', 'remove_handle_redirect_action' )
 				);
 
+				// Set option to not perform onboarding redirect too
+				update_option( 'nfd_module_onboarding_should_redirect', '0' );
 			}
 		},
-		11
+		101
 	);
 }