diff --git a/src/danog/MadelineProto/API.php b/src/danog/MadelineProto/API.php
index 93d17ba0..21ce60e8 100644
--- a/src/danog/MadelineProto/API.php
+++ b/src/danog/MadelineProto/API.php
@@ -71,6 +71,13 @@ class API extends APIFactory
 
         return $this->storage[$name] = $value;
     }
+    public function __isset($name) {
+        return isset($this->storage[$name]);
+    }
+
+    public function __unset($name) {
+        unset($this->storage[$name]);
+    }
 
     public function APIFactory()
     {
diff --git a/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php b/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php
index 84519116..bd348058 100644
--- a/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php
+++ b/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php
@@ -218,7 +218,8 @@ trait UpdateHandler
             $this->updates_state['qts'] = 0;
         }
         if (!$this->got_state) {
-            $this->get_updates_state();
+            $this->got_state = true;
+            $this->set_update_state($this->get_updates_state());
         }
 
         return $this->updates_state;
@@ -280,8 +281,9 @@ trait UpdateHandler
     {
         $last = $this->updates_state['sync_loading'];
         $this->updates_state['sync_loading'] = true;
-        $this->set_update_state($this->method_call('updates.getState', [], ['datacenter' => $this->datacenter->curdc]));
+        $data = $this->method_call('updates.getState', [], ['datacenter' => $this->datacenter->curdc]);
         $this->updates_state['sync_loading'] = $last;
+        return $data;
     }
 
     public function handle_update($update, $options = [])