diff --git a/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php b/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php
index ebd720ed..d2225df7 100644
--- a/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php
+++ b/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php
@@ -48,7 +48,7 @@ trait ResponseHandler
         foreach ($this->datacenter->sockets[$datacenter]->new_incoming as $current_msg_id) {
             $unset = false;
             \danog\MadelineProto\Logger::log(['Received '.$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']['_'].'.'], \danog\MadelineProto\Logger::ULTRA_VERBOSE);
-            \danog\MadelineProto\Logger::log([$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']], \danog\MadelineProto\Logger::ULTRA_VERBOSE);
+            //\danog\MadelineProto\Logger::log([$this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['content']], \danog\MadelineProto\Logger::ULTRA_VERBOSE);
             if (\danog\MadelineProto\Logger::$has_thread && is_object(\Thread::getCurrentThread())) {
                 if (!$this->synchronized(function ($zis, $datacenter, $current_msg_id) {
                     if (isset($this->datacenter->sockets[$datacenter]->incoming_messages[$current_msg_id]['handling'])) {
diff --git a/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php b/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php
index f17c109d..bc0bf866 100644
--- a/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php
+++ b/src/danog/MadelineProto/MTProtoTools/UpdateHandler.php
@@ -124,7 +124,7 @@ trait UpdateHandler
 
     public function get_channel_difference($channel)
     {
-        if (!$this->settings['updates']['handle_updates']) {
+        if (!$this->settings['updates']['handle_updates'] || $this->getting_state) {
             return;
         }
         if (!$this->get_channel_state($channel)['sync_loading']) {
@@ -225,7 +225,7 @@ trait UpdateHandler
 
     public function get_updates_difference()
     {
-        if (!$this->settings['updates']['handle_updates']) {
+        if (!$this->settings['updates']['handle_updates'] || $this->getting_state) {
             return;
         }
         if (!$this->get_update_state()['sync_loading']) {
diff --git a/src/danog/MadelineProto/TL/Types/Button.php b/src/danog/MadelineProto/TL/Types/Button.php
index 58da6292..ac7e6ea2 100644
--- a/src/danog/MadelineProto/TL/Types/Button.php
+++ b/src/danog/MadelineProto/TL/Types/Button.php
@@ -21,7 +21,7 @@ class Button extends \Volatile implements \JsonSerializable
     public function ___construct($API, $message, $button)
     {
         $this->data = $button;
-        $this->info['peer'] = $message['to_id'];
+        $this->info['peer'] = $message['to_id'] === ['_' => 'peerUser', 'user_id' => $API->authorization['user']['id']] ? $message['from_id'] : $message['to_id'];
         $this->info['id'] = $message['id'];
         $this->info['API'] = $API;
     }