diff --git a/packages/api-derive/src/util/index.ts b/packages/api-derive/src/util/index.ts
index 14dc943358..c47b2edc30 100644
--- a/packages/api-derive/src/util/index.ts
+++ b/packages/api-derive/src/util/index.ts
@@ -2,5 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { drr } from '@polkadot/rpc-core/rxjs';
+
 export * from './approvalFlagsToBools';
 export * from './memo';
+
+export { drr };
diff --git a/packages/api/src/base/Decorate.ts b/packages/api/src/base/Decorate.ts
index 68ed15838d..4d1afca7af 100644
--- a/packages/api/src/base/Decorate.ts
+++ b/packages/api/src/base/Decorate.ts
@@ -366,9 +366,8 @@ export default abstract class Decorate<ApiType extends ApiTypes> extends Events
     // entries can be re-linked in the middle of a list, we subscribe here to make
     // sure we catch any updates, no matter the list position
     const getNext = (key: Codec): Observable<LinkageResult> =>
-      this._rpcCore.state.subscribeStorage<[LinkageData | Option<LinkageData>]>([[creator, key]]).pipe(
-        first(),
-        switchMap(([_data]: [LinkageData | Option<LinkageData>]): Observable<LinkageResult> => {
+      this._rpcCore.state.getStorage<LinkageData | Option<LinkageData>>([creator, key]).pipe(
+        switchMap((_data: LinkageData | Option<LinkageData>): Observable<LinkageResult> => {
           const data = creator.meta.modifier.isOptional
             ? (_data as Option<LinkageData>).unwrapOr(null)
             : _data as LinkageData;