diff --git a/app/src/main/java/org/tasks/googleapis/BaseInvoker.kt b/app/src/main/java/org/tasks/googleapis/BaseInvoker.kt
index a7ba711a1..5c4552494 100644
--- a/app/src/main/java/org/tasks/googleapis/BaseInvoker.kt
+++ b/app/src/main/java/org/tasks/googleapis/BaseInvoker.kt
@@ -63,7 +63,7 @@ abstract class BaseInvoker(
 
     private val caller: String
         get() = try {
-            Thread.currentThread().stackTrace[4].methodName
+            Thread.currentThread().stackTrace[12].methodName
         } catch (e: Exception) {
             Timber.e(e)
             ""
diff --git a/app/src/main/java/org/tasks/logging/FileLogger.kt b/app/src/main/java/org/tasks/logging/FileLogger.kt
index e77b556a7..a51c26399 100644
--- a/app/src/main/java/org/tasks/logging/FileLogger.kt
+++ b/app/src/main/java/org/tasks/logging/FileLogger.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.tasks.BuildConfig
 import org.tasks.logging.LogFormatter.Companion.LINE_SEPARATOR
 import timber.log.Timber
 import java.io.File
@@ -48,7 +49,7 @@ class FileLogger @Inject constructor(
     }
 
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        if (priority < Log.DEBUG) {
+        if (!BuildConfig.DEBUG && priority < Log.DEBUG) {
             return
         }
         val threadId = Process.myTid()