diff --git a/packages/app/package.json b/packages/app/package.json
index 96057cd416..331413e7a8 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -25,7 +25,7 @@
         "webpack-bundle-analyzer": "^3.0.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "^2.3.10",
+        "@dhis2/analytics": "2.4",
         "@dhis2/d2-i18n": "^1.0.3",
         "@dhis2/d2-ui-core": "^6.2.1",
         "@dhis2/d2-ui-file-menu": "^6.2.1",
diff --git a/packages/app/src/modules/current.js b/packages/app/src/modules/current.js
index 27ed6ad410..35f8e79597 100644
--- a/packages/app/src/modules/current.js
+++ b/packages/app/src/modules/current.js
@@ -6,6 +6,8 @@ import {
     DIMENSION_ID_DATA,
     DIMENSION_ID_PERIOD,
     dimensionCreate,
+    layoutGetDimensionItems,
+    layoutReplaceDimension,
 } from '@dhis2/analytics';
 
 import options from './options';
@@ -71,16 +73,20 @@ export const getSingleValueCurrentFromUi = (state, action) => {
         },
     };
 
-    // only save the first dx item
     const axesFromUi = getAxesFromUi(ui);
-    if (axesFromUi.columns.length && axesFromUi.columns[0].items.length) {
-        axesFromUi.columns[0].items = [axesFromUi.columns[0].items[0]];
-    }
+
+    // only save the first dx item
+    const dxItems = layoutGetDimensionItems(axesFromUi, DIMENSION_ID_DATA);
+    const singleValueAxesFromUi = layoutReplaceDimension(
+        axesFromUi,
+        DIMENSION_ID_DATA,
+        [dxItems[0]]
+    );
 
     return {
         ...state,
         [BASE_FIELD_TYPE]: ui.type,
-        ...axesFromUi,
+        ...singleValueAxesFromUi,
         ...getOptionsFromUi(ui),
     };
 };
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 6a3f3ebd64..ff598de225 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -5,7 +5,7 @@
     "main": "./build/index.js",
     "license": "BSD-3-Clause",
     "dependencies": {
-        "@dhis2/analytics": "^2.3.10",
+        "@dhis2/analytics": "2.4",
         "@material-ui/core": "^3.1.2",
         "lodash-es": "^4.17.11",
         "react": "^16.6.0",
diff --git a/yarn.lock b/yarn.lock
index 3f7d3a094a..354b5a0e39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -164,10 +164,10 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@dhis2/analytics@^2.1.0":
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.3.4.tgz#7132738b957f7342423f039f31b871465c9f4966"
-  integrity sha512-eLbCGtRRMUWZpvjlAAAfj0zr32J9CpS3oE3yXJlRVcPJwIT7S3xFAkjcgRwazchr5pZnKR/TBwoXmm84mF18zQ==
+"@dhis2/analytics@2.4":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.4.0.tgz#4b77694891c41df4595605d0ae46075687923a38"
+  integrity sha512-7GWWVlHjYEby+VWP4ASOqiTjArNmZGrd4x/aaj65BtemNhIpNA1IuGRKkD7C40VsUNwIn/k33PhIvtCA8C2jMw==
   dependencies:
     "@dhis2/d2-i18n" "^1.0.4"
     "@dhis2/d2-ui-org-unit-dialog" "^6.1.0"
@@ -183,10 +183,10 @@
     react-beautiful-dnd "^10.1.1"
     styled-jsx "^3.2.1"
 
-"@dhis2/analytics@^2.3.10":
-  version "2.3.10"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.3.10.tgz#53b06d47d1fbd263d46abd1f21151fba8cdbcc9b"
-  integrity sha512-qUynHRTfaMcEKchg5koWJNGLv5kRLhh9kvsfxJmMkRQ/X5svh9HrDc99fzl0oEjq9Lv2KOnBxlrN86WqqsjEvQ==
+"@dhis2/analytics@^2.1.0":
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.3.4.tgz#7132738b957f7342423f039f31b871465c9f4966"
+  integrity sha512-eLbCGtRRMUWZpvjlAAAfj0zr32J9CpS3oE3yXJlRVcPJwIT7S3xFAkjcgRwazchr5pZnKR/TBwoXmm84mF18zQ==
   dependencies:
     "@dhis2/d2-i18n" "^1.0.4"
     "@dhis2/d2-ui-org-unit-dialog" "^6.1.0"