diff --git a/tb_device_mqtt.py b/tb_device_mqtt.py
index 0b7c300..24140d3 100644
--- a/tb_device_mqtt.py
+++ b/tb_device_mqtt.py
@@ -234,7 +234,7 @@ def get_minimal_timeout(self):
     def has_limit(self):
         return not self._no_limit
 
-    def set_limit(self, rate_limit, percentage=80):
+    def set_limit(self, rate_limit, percentage=100):
         with self.__lock:
             old_rate_limit_dict = deepcopy(self._rate_limit_dict)
             self._rate_limit_dict = {}
@@ -250,7 +250,7 @@ def set_limit(self, rate_limit, percentage=80):
                 limit = int(int(rate[0]) * percentage / 100)
                 self._rate_limit_dict[int(rate[1])] = {
                     "counter": old_rate_limit_dict.get(rate_limit_time, {}).get('counter', 0),
-                    "start": self._rate_limit_dict.get(rate_limit_time, {}).get('start', int(monotonic())),
+                    "start": old_rate_limit_dict.get(rate_limit_time, {}).get('start', int(monotonic())),
                     "limit": limit}
                 if rate_limit_time < self._minimal_limit:
                     self._minimal_timeout = rate_limit_time + 1