diff --git a/openam-core/src/main/java/com/sun/identity/common/configuration/ConfigurationObserver.java b/openam-core/src/main/java/com/sun/identity/common/configuration/ConfigurationObserver.java
index 2f74b62266..33f3e8a65a 100644
--- a/openam-core/src/main/java/com/sun/identity/common/configuration/ConfigurationObserver.java
+++ b/openam-core/src/main/java/com/sun/identity/common/configuration/ConfigurationObserver.java
@@ -23,6 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2017-2026 3A Systemc, LLC
  */
 
 package com.sun.identity.common.configuration;
@@ -145,8 +146,10 @@ public void globalConfigChanged(String serviceName, String version, String group
                     SSOToken adminToken = AccessController.doPrivileged(AdminTokenAction.getInstance());
                     try {
                         Properties newProp = ServerConfiguration.getServerInstance(adminToken, serverName);
-                        SystemProperties.initializeProperties(newProp, true, true);
-                        notifies(Constants.SVC_NAME_PLATFORM);
+                        if (newProp!=null) {
+                            SystemProperties.initializeProperties(newProp, true, true);
+                            notifies(Constants.SVC_NAME_PLATFORM);
+                        }
                     } catch (SSOException | IOException | SMSException ex) {
                         // ignored
                     }