diff --git a/app/build.gradle b/app/build.gradle
index b0e47feb0..b5c7232b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -262,4 +262,11 @@ ktlint {
     ignoreFailures = true
 }
 
-project.tasks['preBuild'].dependsOn 'ktlintFormat'
\ No newline at end of file
+project.tasks['preBuild'].dependsOn 'ktlintFormat'
+
+if (crashlyticsEnabled()) {
+    afterEvaluate {
+        assembleDebug.finalizedBy(uploadCrashlyticsSymbolFileDebug)
+        packageDebugBundle.finalizedBy(uploadCrashlyticsSymbolFileDebug)
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b98648d65..af9bed404 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:9.1.1"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.0'
     }
 }