diff --git a/CHANGELOG.md b/CHANGELOG.md
index 477f6934..b92aee12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe
 - Abort simulation run when switching to settings tab
 
 ### Fixed
+- population popups for missing data
 - various fixes in charts, texts and units
 - RES share calculation for SQ
 - power and heat demand scaling for future scenario
diff --git a/digiplan/map/popups.py b/digiplan/map/popups.py
index 92f28c29..63ddb203 100644
--- a/digiplan/map/popups.py
+++ b/digiplan/map/popups.py
@@ -5,6 +5,7 @@
 from collections.abc import Iterable
 from typing import Optional, Union
 
+import numpy as np
 import pandas as pd
 from django.db.models import F
 from django.utils.translation import gettext_lazy as _
@@ -68,6 +69,7 @@ def get_chart_options(self) -> dict:
             chart data ready to use in ECharts in JS
         """
         chart_data = self.get_chart_data()
+        chart_data = chart_data.replace([np.nan], [None])
         return charts.create_chart(self.lookup, chart_data)
 
     @abc.abstractmethod