diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 1ea9124d..575ca67e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -43,12 +43,11 @@ import java.util.UUID;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.AlarmClockReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.AlarmReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.BluetoothConnectReceiver;
-import nodomain.freeyourgadget.gadgetbridge.externalevents.CalendarReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.BluetoothPairingRequestReceiver;
+import nodomain.freeyourgadget.gadgetbridge.externalevents.CalendarReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.MusicPlaybackReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.PebbleReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.PhoneCallReceiver;
@@ -584,7 +583,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
         LOG.info("Setting broadcast receivers to: " + enable);
 
         if (enable && initialized && coordinator != null && coordinator.supportsCalendarEvents()) {
-            if (mCalendarReceiver == null) {
+            if (mCalendarReceiver == null  && getPrefs().getBoolean("enable_calendar_sync", true)) {
                 IntentFilter calendarIntentFilter = new IntentFilter();
                 calendarIntentFilter.addAction("android.intent.action.PROVIDER_CHANGED");
                 calendarIntentFilter.addDataScheme("content");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e670700..7ef2fe32 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -128,8 +128,11 @@
     <string name="pref_title_enable_pebblekit">Allow 3rd Party Android App Access</string>
     <string name="pref_summary_enable_pebblekit">Enable experimental support for Android Apps using PebbleKit</string>
 
+    <string name="pref_header_pebble_timeline">Pebble Timeline</string>
     <string name="pref_title_sunrise_sunset">Sunrise and Sunset</string>
     <string name="pref_summary_sunrise_sunset">Send sunrise and sunset times based on the location to the pebble timeline</string>
+    <string name="pref_title_enable_calendar_sync">Sync Calendar</string>
+    <string name="pref_summary_enable_calendar_sync">Send calendar events to the timeline</string>
 
     <string name="pref_title_autoremove_notifications">Autoremove dismissed Notifications</string>
     <string name="pref_summary_autoremove_notifications">Notifications are automatically removed from the Pebble when dismissed from the Android device</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index a41a0ba4..df21d596 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -189,10 +189,6 @@
                     android:key="pebble_reconnect_attempts"
                     android:maxLength="4"
                     android:title="@string/pref_title_pebble_reconnect_attempts" />
-                <CheckBoxPreference
-                    android:title="@string/pref_title_sunrise_sunset"
-                    android:summary="@string/pref_summary_sunrise_sunset"
-                    android:key="send_sunrise_sunset" />
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="autoremove_notifications"
@@ -206,6 +202,17 @@
                     android:defaultValue="@string/p_pebble_privacy_mode_off"
                     android:summary="%s" />
             </PreferenceCategory>
+            <PreferenceCategory android:title="@string/pref_header_pebble_timeline">
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="enable_calendar_sync"
+                    android:summary="@string/pref_summary_enable_calendar_sync"
+                    android:title="@string/pref_title_enable_calendar_sync" />
+                <CheckBoxPreference
+                    android:key="send_sunrise_sunset"
+                    android:summary="@string/pref_summary_sunrise_sunset"
+                    android:title="@string/pref_title_sunrise_sunset" />
+            </PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_header_activitytrackers">
                 <ListPreference
                     android:defaultValue="4"