diff --git a/MtApi5/MtApi5Client.cs b/MtApi5/MtApi5Client.cs
index 8a7612b9..cdba039e 100755
--- a/MtApi5/MtApi5Client.cs
+++ b/MtApi5/MtApi5Client.cs
@@ -3386,6 +3386,8 @@ namespace MtApi5
             lock (_locker)
             {
                 added = _experts.Add(handle);
+                if (_executorHandle == 0)
+                    _executorHandle = (_experts.Count > 0) ? _experts.ElementAt(0) : 0;
             }
 
             if (added)