diff --git a/src/components/spreadsheet-view/spreadsheet/spreadsheet-content/equipment-table.tsx b/src/components/spreadsheet-view/spreadsheet/spreadsheet-content/equipment-table.tsx
index d2f62c6ab2..4526296ef7 100644
--- a/src/components/spreadsheet-view/spreadsheet/spreadsheet-content/equipment-table.tsx
+++ b/src/components/spreadsheet-view/spreadsheet/spreadsheet-content/equipment-table.tsx
@@ -138,6 +138,7 @@ export const EquipmentTable: FunctionComponent<EquipmentTableProps> = ({
         <>
             <CustomAGGrid
                 ref={gridRef}
+                rowData={rowData}
                 rowSelection={{ mode: 'singleRow', checkboxes: false, enableClickSelection: true }}
                 getRowId={getRowId}
                 debounceVerticalScrollbar
diff --git a/src/components/spreadsheet-view/spreadsheet/spreadsheet-content/spreadsheet-content.tsx b/src/components/spreadsheet-view/spreadsheet/spreadsheet-content/spreadsheet-content.tsx
index 2dca60b419..437be676fa 100644
--- a/src/components/spreadsheet-view/spreadsheet/spreadsheet-content/spreadsheet-content.tsx
+++ b/src/components/spreadsheet-view/spreadsheet/spreadsheet-content/spreadsheet-content.tsx
@@ -83,6 +83,14 @@ export const SpreadsheetContent = memo(
         const nodesIds = useSelector((state: AppState) => state.spreadsheetNetwork.nodesIds);
         const { fetchNodesEquipmentData } = useFetchEquipment();
 
+        // Reset isGridReady when the grid is unmounted (disabled=true), so a fresh
+        // false → true transition on remount re-triggers effects depending on it.
+        useEffect(() => {
+            if (disabled) {
+                setIsGridReady(false);
+            }
+        }, [disabled]);
+
         // Initial data loading for this type when the tab is opened
         useEffect(() => {
             if (active && nodesIds.length > 0 && !equipments.isInitialized && !equipments.isFetching) {
@@ -172,12 +180,6 @@ export const SpreadsheetContent = memo(
             );
         }, [equipments, currentNode.id, nodeAliases]);
 
-        useEffect(() => {
-            if (gridRef.current?.api) {
-                gridRef.current.api.setGridOption('rowData', transformedRowData);
-            }
-        }, [transformedRowData, gridRef, isGridReady]);
-
         const filters = useSelector<AppState, FilterConfig[] | undefined>((state) =>
             getColumnFiltersFromState(state, TableType.Spreadsheet, tableDefinition?.uuid)
         );