diff --git a/src/util/analyticalObject.js b/src/util/analyticalObject.js
index 48a518a9a..9388cf09a 100644
--- a/src/util/analyticalObject.js
+++ b/src/util/analyticalObject.js
@@ -1,6 +1,7 @@
 import { config, getInstance as getD2 } from 'd2';
 import { getPeriodNameFromId, getDimensionsFromFilters } from './analytics';
 import { loadDataItemLegendSet } from './legend';
+import { cleanDimension } from './favorites';
 
 export const NAMESPACE = 'analytics';
 export const CURRENT_AO_KEY = 'currentAnalyticalObject';
@@ -91,7 +92,7 @@ export const getAnalyticalObjectFromThematicLayer = (layer = {}) => {
 
     return {
         columns,
-        rows,
+        rows: rows.map(cleanDimension),
         filters,
         aggregationType,
     };
diff --git a/src/util/favorites.js b/src/util/favorites.js
index 7b6918871..d53cb2bcc 100644
--- a/src/util/favorites.js
+++ b/src/util/favorites.js
@@ -167,7 +167,7 @@ const models2objects = config => {
     return config;
 };
 
-const cleanDimension = dim => ({
+export const cleanDimension = dim => ({
     ...dim,
     items: dim.items.map(item => pick(validModelProperties, item)),
 });