diff --git a/Plugin/Quote/Address/RateRequestPlugin.php b/Plugin/Quote/Address/RateRequestPlugin.php
new file mode 100644
index 000000000..631308a97
--- /dev/null
+++ b/Plugin/Quote/Address/RateRequestPlugin.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ *
+ *          ..::..
+ *     ..::::::::::::..
+ *   ::'''''':''::'''''::
+ *   ::..  ..:  :  ....::
+ *   ::::  :::  :  :   ::
+ *   ::::  :::  :  ''' ::
+ *   ::::..:::..::.....::
+ *     ''::::::::::::''
+ *          ''::''
+ *
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Creative Commons License.
+ * It is available through the world-wide-web at this URL:
+ * http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to servicedesk@tig.nl so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact servicedesk@tig.nl for more information.
+ *
+ * @copyright   Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
+ * @license     http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ */
+namespace TIG\PostNL\Plugin\Quote\Address;
+
+class RateRequestPlugin
+{
+    /**
+     * When a customer is logged-in and try's to checkout the error is thrown saying 'Please select a shippingmethod'
+     * This is because of the limitCarrier that is set with 'tig' as value. Later on in the process of the checkout the
+     * carrier config is requested. Magento will request this like carrier/[carrier_code].
+     *
+     * @param $subject
+     * @param $key
+     * @param $value
+     *
+     * @return array
+     */
+    // @codingStandardsIgnoreLine
+    public function beforeSetData($subject, $key, $value)
+    {
+        if ($key == 'limit_carrier' && $value == 'tig') {
+            return [$key, 'tig_postnl'];
+        }
+
+        return [$key, $value];
+    }
+}
diff --git a/Test/Unit/Plugin/Quote/Address/RateRequestPluginTest.php b/Test/Unit/Plugin/Quote/Address/RateRequestPluginTest.php
new file mode 100644
index 000000000..a6691bae0
--- /dev/null
+++ b/Test/Unit/Plugin/Quote/Address/RateRequestPluginTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ *
+ *          ..::..
+ *     ..::::::::::::..
+ *   ::'''''':''::'''''::
+ *   ::..  ..:  :  ....::
+ *   ::::  :::  :  :   ::
+ *   ::::  :::  :  ''' ::
+ *   ::::..:::..::.....::
+ *     ''::::::::::::''
+ *          ''::''
+ *
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Creative Commons License.
+ * It is available through the world-wide-web at this URL:
+ * http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to servicedesk@tig.nl so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact servicedesk@tig.nl for more information.
+ *
+ * @copyright   Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
+ * @license     http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ */
+namespace TIG\PostNL\Test\Unit\Plugin\Quote\Address;
+
+use TIG\PostNL\Plugin\Quote\Address\RateRequestPlugin;
+use TIG\PostNL\Test\TestCase;
+
+class RateRequestPluginTest extends TestCase
+{
+    public $instanceClass = RateRequestPlugin::class;
+
+    public function dataProvider()
+    {
+        return [
+            'TIG PostNL Limit Carrier' => [
+                'limit_carrier',
+                'tig',
+                ['limit_carrier','tig_postnl']
+            ],
+            'FlatRate Limit Carrier' => [
+                'limit_carrier',
+                'flatrate',
+                ['limit_carrier','flatrate']
+            ],
+        ];
+    }
+
+    /**
+     * @param $key
+     * @param $value
+     * @param $expected
+     *
+     * @dataProvider dataProvider
+     */
+    public function testBeforeSetData($key, $value, $expected)
+    {
+        $instance = $this->getInstance();
+        $result = $instance->beforeSetData(null, $key, $value);
+
+        $this->assertEquals($expected, $result);
+    }
+}
\ No newline at end of file
diff --git a/etc/config.xml b/etc/config.xml
index 93ea1f3e3..64f2b619a 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -47,7 +47,7 @@
         </carriers>
         <tig_postnl>
             <stability>alpha</stability>
-            <supported_magento_version>2.1.5</supported_magento_version>
+            <supported_magento_version>2.1.5 - 2.1.9, 2.2.0</supported_magento_version>
             <generalconfiguration_extension_status>
                 <modus>0</modus>
                 <customer_number_test>11223344</customer_number_test>
diff --git a/etc/di.xml b/etc/di.xml
index 18f655bd9..075b8e3f6 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -47,6 +47,10 @@
         <plugin name="TIG_PostNL_Config_Source_Allmethods" type="TIG\PostNL\Plugin\Config\Source\AllMethodsPlugin" sortOrder="1"/>
     </type>
 
+    <type name="\Magento\Quote\Model\Quote\Address\RateRequest">
+        <plugin name="TIG_PostNL_Address_RateRequest" type="TIG\PostNL\Plugin\Quote\Address\RateRequestPlugin" sortOrder="1"/>
+    </type>
+
     <type name="TIG\PostNL\Logging\Log">
         <arguments>
             <argument name="name" xsi:type="string">postnl_logging</argument>
diff --git a/etc/module.xml b/etc/module.xml
index d9269d4cc..80c49eb3c 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -32,7 +32,7 @@
  *
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:TIG_PostNL:etc/tig_module.xsd">
-    <module name="TIG_PostNL" setup_version="1.1.5" stability="alpha">
+    <module name="TIG_PostNL" setup_version="1.1.6" stability="alpha">
         <sequence>
             <module name="Magento_Shipping"/>
             <module name="Magento_Directory"/>