diff --git a/vendor/boltpay/bolt-magento2/view/frontend/web/js/bolt-legacy.js b/vendor/boltpay/bolt-magento2/view/frontend/web/js/bolt-legacy.js
index a506a8c..bef3099 100755
--- a/vendor/boltpay/bolt-magento2/view/frontend/web/js/bolt-legacy.js
+++ b/vendor/boltpay/bolt-magento2/view/frontend/web/js/bolt-legacy.js
@@ -510,7 +510,8 @@ define([
                     if (!toggleCheckoutConfig) {
                         return;
                     }
-                    if (BoltState.codeIsLoaded.isResolved() === false
+                    if (!BoltState.codeIsLoaded || !BoltState.beforeConfigureBarrier
+                        || BoltState.codeIsLoaded.isResolved() === false
                         || BoltState.beforeConfigureBarrier.isResolved() === false
                     ) {
                         // allow extensions to made their setup before we toggle buttons first time
@@ -793,14 +794,14 @@ define([
                             return;
                         }
                         // waiting while all JS code is loaded
-                        if (BoltState.codeIsLoaded.isResolved() === false) {
+                        if (BoltState.codeIsLoaded && BoltState.codeIsLoaded.isResolved() === false) {
                             BoltState.codeIsLoaded.promise.then(function(result){
                                 callConfigure();
                             });
                             return;
                         }
                         // extensions can use this promise to postpone BoltCheckout.configure() calls
-                        if (BoltState.beforeConfigureBarrier.isResolved() === false) {
+                        if (BoltState.beforeConfigureBarrier && BoltState.beforeConfigureBarrier.isResolved() === false) {
                             BoltState.beforeConfigureBarrier.promise.then(function(result){
                                 callConfigure();
                             });