diff --git a/build.gradle b/build.gradle
index 4ef0f6cb7..41f3c13aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -389,7 +389,7 @@ configure(project.fineractJavaProjects) {
             "-Xlint:varargs",
             "-Xlint:preview",
             "-Xlint:static",
-            // "-Werror" // TODO: @vidakovic fix this
+            "-Werror"
         ]
         // TODO FINERACT-959 (gradually) enable -Xlint:all (see "javac -help -X")
 
diff --git a/fineract-client/build.gradle b/fineract-client/build.gradle
index d934bfd76..3ceff1cde 100644
--- a/fineract-client/build.gradle
+++ b/fineract-client/build.gradle
@@ -78,6 +78,11 @@ compileJava {
     source += sourceSets.generated.java
 }
 
+tasks.withType(JavaCompile) {
+    // the generated code contains some warnings in build/generated/java/src/main/java/org/apache/fineract/client/auth/OAuthOkHttpClient.java#L71 that won't pass
+    options.compilerArgs -= ["-Werror"]
+}
+
 configurations {
     generatedCompile.extendsFrom implementation
     generatedRuntime.extendsFrom runtime