diff --git a/src/containers/Storage/PDisk/PDisk.tsx b/src/containers/Storage/PDisk/PDisk.tsx
index 1d34d7e15c..90e0bc3a4b 100644
--- a/src/containers/Storage/PDisk/PDisk.tsx
+++ b/src/containers/Storage/PDisk/PDisk.tsx
@@ -6,10 +6,12 @@ import {PDiskPopup} from '../../../components/PDiskPopup/PDiskPopup';
 import {VDiskWithDonorsStack} from '../../../components/VDisk/VDiskWithDonorsStack';
 import routes, {createHref, getPDiskPagePath} from '../../../routes';
 import {useDiskPagesAvailable} from '../../../store/reducers/capabilities/hooks';
+import {selectNodesMap} from '../../../store/reducers/nodesList';
 import {valueIsDefined} from '../../../utils';
 import {cn} from '../../../utils/cn';
 import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters';
 import type {PreparedPDisk, PreparedVDisk} from '../../../utils/disks/types';
+import {useTypedSelector} from '../../../utils/hooks';
 import {STRUCTURE} from '../../Node/NodePages';
 
 import './PDisk.scss';
@@ -39,6 +41,7 @@ export const PDisk = ({
 }: PDiskProps) => {
     const [isPopupVisible, setIsPopupVisible] = React.useState(false);
 
+    const nodes = useTypedSelector(selectNodesMap);
     const diskPagesAvailable = useDiskPagesAvailable();
 
     const anchor = React.useRef(null);
@@ -115,7 +118,12 @@ export const PDisk = ({
                     <div className={b('media-type')}>{data.Type}</div>
                 </InternalLink>
             </div>
-            <PDiskPopup data={data} anchorRef={anchor} open={isPopupVisible || showPopup} />
+            <PDiskPopup
+                data={data}
+                nodes={nodes}
+                anchorRef={anchor}
+                open={isPopupVisible || showPopup}
+            />
         </React.Fragment>
     );
 };
diff --git a/src/containers/Storage/StorageNodes/columns/columns.tsx b/src/containers/Storage/StorageNodes/columns/columns.tsx
index 49ae2e9fa1..2e95b27031 100644
--- a/src/containers/Storage/StorageNodes/columns/columns.tsx
+++ b/src/containers/Storage/StorageNodes/columns/columns.tsx
@@ -1,7 +1,6 @@
 import DataTable from '@gravity-ui/react-data-table';
 
 import {NodeHostWrapper} from '../../../../components/NodeHostWrapper/NodeHostWrapper';
-import type {AdditionalNodesProps} from '../../../../types/additionalProps';
 import {cn} from '../../../../utils/cn';
 import {EMPTY_DATA_PLACEHOLDER} from '../../../../utils/constants';
 import {isSortableNodesProperty} from '../../../../utils/nodes';
@@ -14,11 +13,11 @@ import './StorageNodesColumns.scss';
 
 const b = cn('ydb-storage-nodes-columns');
 
-const getStorageNodesColumns = (
-    additionalNodesProps: AdditionalNodesProps | undefined,
-    database?: string,
-    groupId?: string,
-) => {
+const getStorageNodesColumns = ({
+    additionalNodesProps,
+    database,
+    groupId,
+}: GetStorageNodesColumnsParams) => {
     const getNodeRef = additionalNodesProps?.getNodeRef;
 
     const columns: StorageNodesColumn[] = [
@@ -107,12 +106,8 @@ const getStorageNodesColumns = (
     return columns;
 };
 
-export const getPreparedStorageNodesColumns = ({
-    additionalNodesProps,
-    database,
-    groupId,
-}: GetStorageNodesColumnsParams) => {
-    const rawColumns = getStorageNodesColumns(additionalNodesProps, database, groupId);
+export const getPreparedStorageNodesColumns = (params: GetStorageNodesColumnsParams) => {
+    const rawColumns = getStorageNodesColumns(params);
 
     const sortableColumns = rawColumns.map((column) => ({
         ...column,