diff --git a/library/build.gradle b/library/build.gradle
index 3f11a9e56b..9ee5e1ecf7 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -50,7 +50,7 @@ configurations {
 dependencies {
     implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5'
     api 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10'
-    implementation 'com.github.bitfireAT:dav4jvm:main-SNAPSHOT'
+    implementation 'com.github.bitfireAT:dav4jvm:2.2'
     // in transition phase, we use old and new libs
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.1'
     implementation 'androidx.annotation:annotation:1.5.0'
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java
index f6b6c5ba66..bc92c380e9 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java
@@ -216,7 +216,6 @@ public RemoteOperationResult run(NextcloudClient client) {
                     HttpUrl.get(client.getDavUri().toString()))
                     .search(searchString, (response, hrefRelation) -> {
                         responses.add(response);
-                        return null;
                     });
 
             // get data from remote folder
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java
index b91ce836ef..8e3938b7ac 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java
@@ -140,7 +140,6 @@ public RemoteOperationResult run(NextcloudClient client) {
                 HttpUrl.get(fullFilePath))
                 .proppatch(newProperties, removeProperties, (response, hrefRelation) -> {
                     //resultCode = response.isSuccess();
-                    return null;
                 });
 
         result = new RemoteOperationResult<>(RemoteOperationResult.ResultCode.OK);