diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89ef55f588..637a774544 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 6.0.3
 
+* `Core`:
+    * `User` in `CallbackQuery` now is `CommonUser` as well as `from`
 * `BehaviourBuilder`:
     * Fixes in `DeepLink` triggers and waiters
 
diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/CallbackQuery.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/CallbackQuery.kt
index 66a0fb494b..77740723dc 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/CallbackQuery.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/queries/callback/CallbackQuery.kt
@@ -9,6 +9,8 @@ sealed interface CallbackQuery : FromUser {
     val id: CallbackQueryIdentifier
     val chatInstance: String
     override val from: CommonUser
+    override val user: CommonUser
+        get() = from
 }
 
 data class UnknownCallbackQueryType(