diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java b/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
index 71f2ebaa6..9bedf4677 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 import com.couchbase.client.java.json.JsonArray;
@@ -339,7 +340,7 @@ public enum YearMonthToStringConverter implements Converter<YearMonth, String> {
 
 		@Override
 		public String convert(YearMonth source) {
-			return source.toString();
+			return Optional.ofNullable(source).map(YearMonth::toString).orElse(null);
 		}
 	}
 
@@ -350,7 +351,7 @@ public enum StringToYearMonthConverter implements Converter<String, YearMonth> {
 
 		@Override
 		public YearMonth convert(String source) {
-			return YearMonth.parse(source);
+			return Optional.ofNullable(source).map(YearMonth::parse).orElse(null);
 		}
 	}