diff --git a/debezium-core/src/main/java/io/debezium/util/LoggingContext.java b/debezium-core/src/main/java/io/debezium/util/LoggingContext.java
index aa6534224..da5bf2034 100644
--- a/debezium-core/src/main/java/io/debezium/util/LoggingContext.java
+++ b/debezium-core/src/main/java/io/debezium/util/LoggingContext.java
@@ -99,8 +99,12 @@ public static PreviousContext forConnector(String connectorType, String connecto
         if (taskId != null) {
             MDC.put(TASK_ID, taskId);
         }
-        if (partition != null) {
-            partition.getLoggingContext().forEach(MDC::put);
+        if (partition != null && partition.getLoggingContext() != null) {
+            partition.getLoggingContext().forEach((k, v) -> {
+                if (k != null && v != null) {
+                    MDC.put(k, v);
+                }
+            });
         }
         MDC.put(CONNECTOR_TYPE, connectorType);
         MDC.put(CONNECTOR_NAME, connectorName);