diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 93a5a281662d752044879b50a0a4b0450b369ca4..4a060c33fdf0e1109efa102c46e388ce215e84d8 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -39,7 +39,7 @@ define(
                 this._super()
                     .observe({
                         selectedAddress: null,
-                        isAddressDetailsVisible: quote.shippingAddress() != null,
+                        isAddressDetailsVisible: quote.billingAddress() != null,
                         isAddressFormVisible: !customer.isLoggedIn() || addressOptions.length == 1,
                         isAddressSameAsShipping: false
                     });
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
index 1734a79d09f5490d746e13a4d60eb524ba60f664..4c93ab6c7e11f13f2a2d8aa8b8d2e1f37818d0fd 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
@@ -17,7 +17,7 @@ define(
         'use strict';
         return Component.extend({
             redirectAfterPlaceOrder: true,
-            isPlaceOrderActionAllowed: ko.observable(true),
+            isPlaceOrderActionAllowed: ko.observable(quote.billingAddress() != null),
             /**
              * Initialize view.
              *