diff --git a/Model/Carrier.php b/Model/Carrier.php
index b823ddd..abf08e3 100644
--- a/Model/Carrier.php
+++ b/Model/Carrier.php
@@ -317,7 +317,9 @@ protected function getMethodTitle(\Magento\Quote\Model\Quote\Address\RateRequest
             }
 
             // Select default servicePoint if none is selected
-            if (!$servicePointId) {
+            $selectFirstByDefault = $this->getConfigData('shipping_methods/servicepoint/default_select_first');
+
+            if (!$servicePointId && $selectFirstByDefault) {
                 $toCountry = $request->getDestCountryId();
                 $toPostalCode = $request->getDestPostcode();
                 $servicePoint = $this->servicePointService->getClosest($toPostalCode, $toCountry);
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index c86bbed..d47bd6a 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -738,6 +738,15 @@
                             <label>Title</label>
                             <comment>Leave empty to use default title</comment>
                         </field>
+                        <field id="default_select_first" translate="label" type="select" sortOrder="450" showInDefault="1"
+                               showInWebsite="1" showInStore="1">
+                            <label>Default select first servicepoint</label>
+                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                            <comment>By enabling this option, if the customer is not selecting a service point, the most closeby service point will be selected.</comment>
+                            <depends>
+                                <field id="enabled">1</field>
+                            </depends>
+                        </field>
                         <field id="rate_method" translate="label" type="select" sortOrder="300" showInDefault="1"
                                showInWebsite="1" showInStore="1">
                             <label>Pricing method</label>