diff --git a/db/patch-fix-kafka-producer-booleans.sql b/db/patch-fix-kafka-producer-booleans.sql
index 810ec92e3..505f65a95 100644
--- a/db/patch-fix-kafka-producer-booleans.sql
+++ b/db/patch-fix-kafka-producer-booleans.sql
@@ -16,8 +16,11 @@ ALTER TABLE monitor
     ADD COLUMN kafka_producer_allow_auto_topic_creation BOOLEAN default 0 NOT NULL;
 
 -- Set bring old values from `_old` COLUMNs to correct ones
-UPDATE monitor set kafka_producer_allow_auto_topic_creation = monitor.kafka_producer_allow_auto_topic_creation_old;
-UPDATE monitor set kafka_producer_ssl = monitor.kafka_producer_ssl_old;
+UPDATE monitor SET kafka_producer_allow_auto_topic_creation = monitor.kafka_producer_allow_auto_topic_creation_old
+    WHERE monitor.kafka_producer_allow_auto_topic_creation_old IS NOT NULL;
+
+UPDATE monitor SET kafka_producer_ssl = monitor.kafka_producer_ssl_old
+    WHERE monitor.kafka_producer_ssl_old IS NOT NULL;
 
 -- Remove old COLUMNs
 ALTER TABLE monitor