diff --git a/includes/class-wc-cart.php b/includes/class-wc-cart.php
index 4beb6089b8f..fbdb9dd3007 100644
--- a/includes/class-wc-cart.php
+++ b/includes/class-wc-cart.php
@@ -1505,7 +1505,8 @@ class WC_Cart {
 		 * @return bool whether or not the cart needs shipping
 		 */
 		public function needs_shipping() {
-			if ( ! wc_shipping_enabled() ) {
+			// If shipping is disabled or not yet configured, we can skip this.
+			if ( ! wc_shipping_enabled() || 0 === wc_get_shipping_method_count( true ) ) {
 				return false;
 			}