diff --git a/apps/web/Components/Calculation/Form/ELT/Components/PolicyTable.jsx b/apps/web/Components/Calculation/Form/ELT/Components/PolicyTable.jsx
index 3ce7a82..08da848 100644
--- a/apps/web/Components/Calculation/Form/ELT/Components/PolicyTable.jsx
+++ b/apps/web/Components/Calculation/Form/ELT/Components/PolicyTable.jsx
@@ -4,7 +4,7 @@ import { Table } from 'ui/antd';
 
 export const PolicyTable = observer(({ getter, ...props }) => {
   const { $tables } = useStore();
-  const { getValues, setSelectedKey } = getter($tables.elt);
+  const { getValues, setSelectedKey, getSelectedRow } = getter($tables.elt);
 
   return (
     <Table
@@ -19,6 +19,7 @@ export const PolicyTable = observer(({ getter, ...props }) => {
         onSelect: (record) => {
           setSelectedKey(record.key);
         },
+        selectedRowKeys: getSelectedRow ? [getSelectedRow.key] : [],
         type: 'radio',
       }}
       {...props}
diff --git a/apps/web/stores/tables/elt/policy.ts b/apps/web/stores/tables/elt/policy.ts
index d99796f..135dcae 100644
--- a/apps/web/stores/tables/elt/policy.ts
+++ b/apps/web/stores/tables/elt/policy.ts
@@ -62,7 +62,7 @@ export default class PolicyStore {
   };
 
   public resetSelectedKey = () => {
-    this.selectedKey = null;
+    if (this.setSelectedKey !== null) this.selectedKey = null;
   };
 
   public get getSelectedRow() {