diff --git a/README.md b/README.md
index 524174149..eda064f8b 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,13 @@ It currently consists of
 
 # Release Notes
 BOAT is still under development and subject to change.
+## 0.17.59
+* Fix bug where java-spring generator puts `@Valid` annoation on return type of Api methods, cause service to blame
+  client for invalid generated response with a 400 status.
+## 0.17.58
+
+## 0.17.57
+
 ## 0.17.56
 * Added new `flattenOutput` parameter into `bundle` execution to generate the bundled APIs directly into `output` directory, even though the respective `input` files are located within a subdirectory in the `input`.
 ## 0.17.55
diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java
index 86309d269..89e23ee2e 100644
--- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java
+++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java
@@ -392,6 +392,9 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
             codegenParameter.paramName = "httpServletRequest";
             codegenOperation.allParams.add(codegenParameter);
         }
+        if (codegenOperation.returnType != null) {
+            codegenOperation.returnType = codegenOperation.returnType.replace("@Valid", "");
+        }
         return codegenOperation;
     }