diff --git a/bots/notify/src/main/java/org/openjdk/skara/bots/notify/issue/Backports.java b/bots/notify/src/main/java/org/openjdk/skara/bots/notify/issue/Backports.java
index 2b7d65c48..61c1de3b7 100644
--- a/bots/notify/src/main/java/org/openjdk/skara/bots/notify/issue/Backports.java
+++ b/bots/notify/src/main/java/org/openjdk/skara/bots/notify/issue/Backports.java
@@ -72,8 +72,8 @@ static Optional<JdkVersion> mainFixVersion(Issue issue) {
             log.warning("Issue " + issue.id() + " has multiple valid fixVersions - ignoring");
             return Optional.empty();
         }
-        if (issue.properties().containsKey("customfield_10006")) {
-            return Optional.of(JdkVersion.parse(versionString.get(0), issue.properties().get("customfield_10006").asString()));
+        if (issue.properties().containsKey("customfield_10006") && issue.properties().get("customfield_10006").isObject()) {
+            return Optional.of(JdkVersion.parse(versionString.get(0), issue.properties().get("customfield_10006").get("value").asString()));
         } else {
             return Optional.of(JdkVersion.parse(versionString.get(0)));
         }
diff --git a/bots/notify/src/test/java/org/openjdk/skara/bots/notify/issue/BackportsTests.java b/bots/notify/src/test/java/org/openjdk/skara/bots/notify/issue/BackportsTests.java
index b496b60cd..df3498aaf 100644
--- a/bots/notify/src/test/java/org/openjdk/skara/bots/notify/issue/BackportsTests.java
+++ b/bots/notify/src/test/java/org/openjdk/skara/bots/notify/issue/BackportsTests.java
@@ -175,7 +175,7 @@ private void setVersion(Issue issue, String version) {
             }
             issue.setProperty("fixVersions", JSON.array().add(version));
             if (!resolvedInBuild.isEmpty()) {
-                issue.setProperty("customfield_10006", JSON.of(resolvedInBuild));
+                issue.setProperty("customfield_10006", JSON.object().put("value", resolvedInBuild));
             }
         }