diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7065380d..90f7c4fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,10 @@
 		android:supportsRtl="true"
 		android:theme="@style/PokerAnalyticsTheme">
 
+		<meta-data
+			android:name="firebase_crashlytics_collection_enabled"
+			android:value="false" />
+
 		<activity
 			android:name=".ui.activity.HomeActivity"
 			android:label="@string/app_name">
@@ -26,39 +30,39 @@
 
 		<activity
 			android:name=".ui.activity.SessionActivity"
-			android:screenOrientation="portrait"
 			android:launchMode="singleTop"
+			android:screenOrientation="portrait"
 			android:windowSoftInputMode="adjustNothing" />
 
 		<activity
 			android:name=".ui.activity.DataListActivity"
-			android:screenOrientation="portrait"
-			android:launchMode="singleTop" />
+			android:launchMode="singleTop"
+			android:screenOrientation="portrait" />
 
 		<activity
 			android:name=".ui.activity.EditableDataActivity"
-			android:screenOrientation="portrait"
-			android:launchMode="singleTop" />
+			android:launchMode="singleTop"
+			android:screenOrientation="portrait" />
 
 		<activity
 			android:name=".ui.activity.CurrenciesActivity"
-			android:screenOrientation="portrait"
-			android:launchMode="singleTop" />
+			android:launchMode="singleTop"
+			android:screenOrientation="portrait" />
 
 		<activity
 			android:name=".ui.activity.FiltersActivity"
-			android:screenOrientation="portrait"
-			android:launchMode="singleTop" />
+			android:launchMode="singleTop"
+			android:screenOrientation="portrait" />
 
 		<activity
 			android:name=".ui.activity.FilterDetailsActivity"
-			android:screenOrientation="portrait"
-			android:launchMode="singleTop" />
+			android:launchMode="singleTop"
+			android:screenOrientation="portrait" />
 
 		<activity
 			android:name=".ui.activity.GDPRActivity"
-			android:screenOrientation="portrait"
-			android:launchMode="singleTop" />
+			android:launchMode="singleTop"
+			android:screenOrientation="portrait" />
 
 		<meta-data
 			android:name="preloaded_fonts"
diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
index ac9d6737..4bcfd049 100644
--- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
+++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
@@ -18,7 +18,6 @@ import timber.log.Timber
 
 
 
-
 class PokerAnalyticsApplication : Application() {
 
 	override fun onCreate() {
@@ -34,8 +33,14 @@ class PokerAnalyticsApplication : Application() {
 			.build()
 		Realm.setDefaultConfiguration(realmConfiguration)
 
-		val core = CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()
-		Fabric.with(this, Crashlytics.Builder().core(core).build())
+		// Set up Crashlytics, disabled for debug builds
+		val crashlyticsKit = Crashlytics.Builder()
+			.core(CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build())
+			.build()
+
+		// Initialize Fabric with the debug-disabled crashlytics.
+		Fabric.with(this, crashlyticsKit)
+
 
 		if (BuildConfig.DEBUG) {
 			// Logs