diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
index b064cf294f..3d76d9339f 100644
--- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
+++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
@@ -482,7 +482,7 @@ public class ControlPanel extends AbstractDSpaceTransformer implements Serviceab
      * @param value candidate string.
      * @return {@code value} or a constant indicating an unset value.
      */
-    private static String notempty(String value) { return "".equals(value) ? T_UNSET : value; }
+    private static String notempty(String value) { return "".equals(value) || null == value ? T_UNSET : value; }
 
     /**
      * List important DSpace configuration parameters.