diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 3fce35bf0e..0519798124 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -53,6 +53,7 @@ Yii Framework 2 Change Log
 - Enh #20591: Add PHPStan/Psalm annotations for `yii\rbac\BaseManager::getItems()` (mspirkov)
 - Bug #20594: Fix `@return` annotation for `Instance::get()` (mspirkov)
 - Bug #20595: Fix `@return` annotation for `BaseHtml::getAttributeValue()` (mspirkov)
+- Bug #20604: Fix `@var` annotation for `yii\db\Command::$pdoStatement` (mspirkov)
 - Bug #20600: Fix `@var` annotation for `yii\test\FileFixtureTrait::$dataFile` (mspirkov)
 
 
diff --git a/framework/db/Command.php b/framework/db/Command.php
index 7b81f5d8b4..82f0a25d82 100644
--- a/framework/db/Command.php
+++ b/framework/db/Command.php
@@ -61,7 +61,7 @@ class Command extends Component
      */
     public $db;
     /**
-     * @var \PDOStatement the PDOStatement object that this command is associated with
+     * @var \PDOStatement|null the PDOStatement object that this command is associated with
      */
     public $pdoStatement;
     /**
@@ -95,11 +95,11 @@ class Command extends Component
     protected $pendingParams = [];
 
     /**
-     * @var string the SQL statement that this command represents
+     * @var string|null the SQL statement that this command represents
      */
     private $_sql;
     /**
-     * @var string name of the table, which schema, should be refreshed after command execution.
+     * @var string|null name of the table, which schema, should be refreshed after command execution.
      */
     private $_refreshTableName;
     /**