diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb1b7ca0a5..eb6f6bb14b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## master
+
+Changes:
+
+- Don't fake signature for `paymentInfo` if already signed
+
+
 ## 8.1.1 Apr 17, 2022
 
 Contributed:
diff --git a/packages/api/src/submittable/createClass.ts b/packages/api/src/submittable/createClass.ts
index 5fb7b1d151..5df4537c7a 100644
--- a/packages/api/src/submittable/createClass.ts
+++ b/packages/api/src/submittable/createClass.ts
@@ -119,7 +119,14 @@ export function createClass <ApiType extends ApiTypes> ({ api, apiType, blockHas
       if (blockHash || isString(optionsOrHash) || isU8a(optionsOrHash)) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return decorateMethod(
-          (): Observable<RuntimeDispatchInfo> => api.rpc.payment.queryInfo(this.toHex(), blockHash || optionsOrHash as string)
+          (): Observable<RuntimeDispatchInfo> =>
+            api.rpc.payment.queryInfo(this.toHex(), blockHash || optionsOrHash as string)
+        );
+      } else if (this.isSigned) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-call
+        return decorateMethod(
+          (): Observable<RuntimeDispatchInfo> =>
+            api.rpc.payment.queryInfo(this.toHex())
         );
       }