diff --git a/td/telegram/OptionManager.cpp b/td/telegram/OptionManager.cpp
index 334cadaaf..ac7f312ef 100644
--- a/td/telegram/OptionManager.cpp
+++ b/td/telegram/OptionManager.cpp
@@ -302,7 +302,15 @@ void OptionManager::get_option(const string &name, Promise<td_api::object_ptr<td
   wrap_promise().set_value(Unit());
 }
 
-void OptionManager::get_current_state(vector<td_api::object_ptr<td_api::Update>> &updates) {
+void OptionManager::get_current_state(vector<td_api::object_ptr<td_api::Update>> &updates) const {
+  updates.push_back(td_api::make_object<td_api::updateOption>(
+      "version", td_api::make_object<td_api::optionValueString>(Td::TDLIB_VERSION)));
+
+  updates.push_back(
+      td_api::make_object<td_api::updateOption>("online", td_api::make_object<td_api::optionValueBoolean>(td_->is_online())));
+  updates.push_back(td_api::make_object<td_api::updateOption>(
+      "unix_time", td_api::make_object<td_api::optionValueInteger>(G()->unix_time())));
+
   for (const auto &option : G()->shared_config().get_options()) {
     if (!is_internal_option(option.first)) {
       updates.push_back(td_api::make_object<td_api::updateOption>(
diff --git a/td/telegram/OptionManager.h b/td/telegram/OptionManager.h
index 957034ec9..5dda42b81 100644
--- a/td/telegram/OptionManager.h
+++ b/td/telegram/OptionManager.h
@@ -34,7 +34,7 @@ class OptionManager final : public Actor {
 
   static void clear_options();
 
-  static void get_current_state(vector<td_api::object_ptr<td_api::Update>> &updates);
+  void get_current_state(vector<td_api::object_ptr<td_api::Update>> &updates) const;
 
  private:
   void tear_down() final;
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index afaa95906..19b60c0fb 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -4398,15 +4398,7 @@ void Td::on_request(uint64 id, td_api::confirmQrCodeAuthentication &request) {
 void Td::on_request(uint64 id, const td_api::getCurrentState &request) {
   vector<td_api::object_ptr<td_api::Update>> updates;
 
-  updates.push_back(td_api::make_object<td_api::updateOption>(
-      "version", td_api::make_object<td_api::optionValueString>(TDLIB_VERSION)));
-
-  updates.push_back(
-      td_api::make_object<td_api::updateOption>("online", make_tl_object<td_api::optionValueBoolean>(is_online_)));
-  updates.push_back(td_api::make_object<td_api::updateOption>(
-      "unix_time", make_tl_object<td_api::optionValueInteger>(G()->unix_time())));
-
-  OptionManager::get_current_state(updates);
+  option_manager_->get_current_state(updates);
 
   auto state = auth_manager_->get_current_authorization_state_object();
   if (state != nullptr) {