diff --git a/catroid/build.gradle b/catroid/build.gradle
index 10198428820..e64b61ff0e0 100644
--- a/catroid/build.gradle
+++ b/catroid/build.gradle
@@ -510,6 +510,9 @@ dependencies {
 
     // Room Test helpers
     testImplementation("androidx.room:room-testing:$room_version")
+
+    // LeakCanary - Memory leak detection (debug builds only)
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 }
 
 static def getGitCommitInfo() {
diff --git a/catroid/src/main/java/org/catrobat/catroid/web/CatrobatServerCalls.kt b/catroid/src/main/java/org/catrobat/catroid/web/CatrobatServerCalls.kt
index 39f0f9580f6..5122499428d 100644
--- a/catroid/src/main/java/org/catrobat/catroid/web/CatrobatServerCalls.kt
+++ b/catroid/src/main/java/org/catrobat/catroid/web/CatrobatServerCalls.kt
@@ -30,7 +30,8 @@ import okhttp3.ConnectionSpec
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okio.Okio
+import okio.buffer
+import okio.sink
 import org.catrobat.catroid.common.Constants
 import org.catrobat.catroid.web.ServerAuthenticationConstants.CHECK_EMAIL_AVAILABLE_URL
 import org.catrobat.catroid.web.ServerAuthenticationConstants.CHECK_GOOGLE_TOKEN_URL
@@ -248,7 +249,7 @@ class CatrobatServerCalls(private val okHttpClient: OkHttpClient = CatrobatWebCl
         try {
             val response = httpClient.newCall(request).execute()
             if (response.isSuccessful) {
-                val bufferedSink = Okio.buffer(Okio.sink(destination))
+                val bufferedSink = destination.sink().buffer()
                 response.body()?.let { bufferedSink.writeAll(it.source()) }
                 bufferedSink.close()
                 successCallback.onSuccess()