diff --git a/src/ActiveQuery.php b/src/ActiveQuery.php
index 4cb8160d7..651ae80aa 100644
--- a/src/ActiveQuery.php
+++ b/src/ActiveQuery.php
@@ -107,6 +107,15 @@ class ActiveQuery extends Query implements ActiveQueryInterface
     private array $joinWith = [];
     private ActiveRecordInterface|null $arInstance = null;
 
+    /**
+     * @param string $arClass
+     * @param ConnectionInterface $db
+     * @param ActiveRecordFactory|null $arFactory
+     * @param string $tableName
+     *
+     * @psalm-template T of ActiveRecordInterface
+     * @psalm-param class-string<T> $arClass
+     */
     final public function __construct(
         protected string $arClass,
         protected ConnectionInterface $db,
diff --git a/src/ActiveRecordFactory.php b/src/ActiveRecordFactory.php
index bfb110982..09f67f957 100644
--- a/src/ActiveRecordFactory.php
+++ b/src/ActiveRecordFactory.php
@@ -31,11 +31,8 @@ public function __construct(private Factory $factory)
      * @throws NotInstantiableException
      * @return ActiveRecordInterface
      *
-     * @template T of ActiveRecordInterface
-     * @template-typeof T $arClass
      * @psalm-template T of ActiveRecordInterface
      * @psalm-param class-string<T> $arClass
-     * @psalm-assert class-string<T> $arClass
      * @psalm-return T
      */
     public function createAR(