diff --git a/climada/trajectories/calc_risk_metrics.py b/climada/trajectories/calc_risk_metrics.py
index 39c0b8fca..56509c4fd 100644
--- a/climada/trajectories/calc_risk_metrics.py
+++ b/climada/trajectories/calc_risk_metrics.py
@@ -255,7 +255,12 @@ def calc_eai_gdf(self) -> pd.DataFrame:
 
         """
 
-        metric_df = pd.DataFrame(self.per_date_eai, index=self._date_idx)
+        metric_df = pd.DataFrame(
+            self.per_date_eai,
+            index=self._date_idx,
+            columns=self.snapshots[0].exposure.gdf.index,
+        )
+
         metric_df = metric_df.reset_index().melt(
             id_vars=DATE_COL_NAME, var_name=COORD_ID_COL_NAME, value_name=RISK_COL_NAME
         )
@@ -868,7 +873,11 @@ def calc_eai_gdf(self) -> pd.DataFrame:
         (notably for `value` and `group_id`).
 
         """
-        metric_df = pd.DataFrame(self.per_date_eai, index=self.date_idx)
+        metric_df = pd.DataFrame(
+            self.per_date_eai,
+            index=self._date_idx,
+            columns=self.snapshot_start.exposure.gdf.index,
+        )
         metric_df = metric_df.reset_index().melt(
             id_vars=DEFAULT_PERIOD_INDEX_NAME,
             var_name=COORD_ID_COL_NAME,