diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
index 68a8f69..5d42f0d 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
@@ -100,11 +100,13 @@ public class MainActivity extends AppCompatActivity implements
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        //Initialize crash reporter
-        CrashReporter reporter = new CrashReporter(this, BuildConfig.crash_reporter_url,
-                BuildConfig.crash_reporter_key);
-        reporter.uploadAwaitingReport();
-        Thread.setDefaultUncaughtExceptionHandler(reporter);
+        //Initialize crash reporter (if enabled)
+        if(PreferencesUtils.getBoolean(this, "enable_crash_reporting", true)){
+            CrashReporter reporter = new CrashReporter(this, BuildConfig.crash_reporter_url,
+                    BuildConfig.crash_reporter_key);
+            reporter.uploadAwaitingReport();
+            Thread.setDefaultUncaughtExceptionHandler(reporter);
+        }
 
         //Initialize account objects
         accountHelper = new AccountHelper(this);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ac8d33..0463eb2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -209,4 +209,6 @@
     <string name="notif_sent_group_membership_request">sent a request to join the group</string>
     <string name="notif_accepted_group_membership_request">accepted your request to join the group</string>
     <string name="notif_rejected_group_membership_request">rejected your request to join the group</string>
+    <string name="preference_crash_reporting_title">Send crash reports</string>
+    <string name="preference_crash_reporting_summary">Help us improve Comunic by sending anonymous reports when the application crash.</string>
 </resources>
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index 8eeb7d4..daa81e4 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -16,4 +16,11 @@
         android:title="@string/preference_debug_mode_title"
         android:summary="@string/preference_debug_mode_summary" />
 
+    <!-- Enable or disable crash reporting -->
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="enable_crash_reporting"
+        android:title="@string/preference_crash_reporting_title"
+        android:summary="@string/preference_crash_reporting_summary"/>
+
 </PreferenceScreen>
\ No newline at end of file