diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
index fd7dbf2607b..2e576d226b8 100644
--- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
@@ -35,6 +35,6 @@ void testShutdownFlag(final Configuration config, final LoggerContext ctx) throw
         Field shutdownCallback = LoggerContext.class.getDeclaredField("shutdownCallback");
         Object fieldValue = ReflectionUtil.getFieldValue(shutdownCallback, ctx);
         assertFalse(config.isShutdownHookEnabled(), "Shutdown hook is enabled");
-        assertNull(fieldValue, "Shutdown callback is null");
+        assertNull(fieldValue, "Shutdown callback");
     }
 }
diff --git a/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml b/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml
index 2cc90a336bb..72a3b7eedc5 100644
--- a/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml
+++ b/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml
@@ -2,7 +2,7 @@
 <entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
-       type="added">
+       type="fixed">
     <issue id="2614" link="https://github.com/apache/logging-log4j2/issues/2614"/>
     <description format="asciidoc">
         Fix shutdownDisable configuration does not take effect