diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json
index e0c9f36b9ed..87957058d10 100644
--- a/amp/TEMPLATE/reamp/package-lock.json
+++ b/amp/TEMPLATE/reamp/package-lock.json
@@ -309,7 +309,7 @@
     },
     "node_modules/amp-ui": {
       "version": "2.1.1",
-      "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#b033cf93099abd3fd308a1d3080f95ac9ddbb5fd",
+      "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#0c77c783f9f652f22cb02fd99ed0aa34a101132a",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9493,7 +9493,7 @@
       "dev": true
     },
     "amp-ui": {
-      "version": "git+ssh://git@github.com/devgateway/amp-ui.git#b033cf93099abd3fd308a1d3080f95ac9ddbb5fd",
+      "version": "git+ssh://git@github.com/devgateway/amp-ui.git#0c77c783f9f652f22cb02fd99ed0aa34a101132a",
       "dev": true,
       "from": "amp-ui@github:devgateway/amp-ui#fix/AMP-31133/Indicator-values-display-fixes",
       "requires": {
diff --git a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/activity/PossibleValuesEnumerator.java b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/activity/PossibleValuesEnumerator.java
index 1e2c76cf81f..1219f790f81 100644
--- a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/activity/PossibleValuesEnumerator.java
+++ b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/activity/PossibleValuesEnumerator.java
@@ -244,6 +244,12 @@ private PossibleValuesProvider getPossibleValuesForComplexField(APIField apiFiel
             discriminatorValue = apiField.getDiscriminatorValue();
         }
         if (StringUtils.isBlank(discriminatorValue)) {
+            if (clazz.equals(AmpCategoryValue.class)) {
+                LOGGER.warn("Missing discriminator for category field " + apiField.getFieldName()
+                        + " (" + apiField.getFieldNameInternal() + ")"
+                        + ". Falling back to generic category value enumeration.");
+                return new GenericPossibleValuesProvider(clazz, () -> possibleValuesDAO.getGenericValues(clazz));
+            }
             throw InterchangeUtils.newServerErrorException("Field without discriminator value. " + apiField);
         }