diff --git a/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js b/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js
index 56e24695bf2..bd379523928 100644
--- a/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js
+++ b/addons/analytic/static/src/components/analytic_distribution/analytic_distribution.js
@@ -563,7 +563,8 @@ export class AnalyticDistribution extends Component {
                 if (this.isDropdownOpen) {
                     const closestCell = ev.target.closest("td, th");
                     const row = closestCell.parentElement;
-                    if (this.adjacentElementToFocus("next") == this.addLineButton.el && this.lineIsValid(this.state.formattedData[parseInt(row.id)])) {
+                    const line = this.state.formattedData[parseInt(row.id)];
+                    if (this.adjacentElementToFocus("next") == this.addLineButton.el && line && this.lineIsValid(line)) {
                         this.addLine();
                         break;
                     }