diff --git a/class-wc-gateway-komoju.php b/class-wc-gateway-komoju.php
index 442b6fc..6372757 100755
--- a/class-wc-gateway-komoju.php
+++ b/class-wc-gateway-komoju.php
@@ -173,6 +173,8 @@ public function create_session_for_order($order_id, $payment_type = null)
         }
 
         $shipping_address = null;
+        $ship_to_billing  = get_option('woocommerce_ship_to_destination') === 'billing';
+
         if ($order->has_shipping_address()) {
             $shipping_address = [
                 'zipcode'         => $order->get_shipping_postcode(),
@@ -182,6 +184,8 @@ public function create_session_for_order($order_id, $payment_type = null)
                 'state'           => $order->get_shipping_state(),
                 'city'            => $order->get_shipping_city(),
             ];
+        } elseif ($ship_to_billing) {
+            $shipping_address = $billing_address;
         }
 
         // new session