diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
index a14bd1cbb..477519598 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
@@ -16,8 +16,8 @@ public class PebbleCoordinator implements DeviceCoordinator {
     private MorpheuzSampleProvider sampleProvider;
 
     public PebbleCoordinator() {
-        sampleProvider = new MorpheuzSampleProvider();
-//        sampleProvider = new PebbleGadgetBridgeSampleProvider();
+        //sampleProvider = new MorpheuzSampleProvider();
+        sampleProvider = new PebbleGadgetBridgeSampleProvider();
     }
 
     @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a61b92e32..a60ab6c55 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,8 @@
     <string name="pref_title_pebble_settings">Pebble Settings</string>
     <string name="pref_title_pebble_forceprotocol">Force Notification Protocol</string>
     <string name="pref_summary_pebble_forceprotocol">This option forces using the latest notification protocol depending on the firmware version. ENABLE ONLY IF YOU KNOW WHAT YOU ARE DOING!</string>
-
+    <string name="pref_title_pebble_forceuntested">Enable untested features</string>
+    <string name="pref_summary_pebble_forceuntested">Enable features that are untested. ENABLE ONLY IF YOU KNOW WHAT YOU ARE DOING!</string>
 
     <string name="not_connected">not connected</string>
     <string name="connecting">connecting</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b142998de..7e6e3cee8 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -72,6 +72,11 @@
                     android:key="pebble_force_protocol"
                     android:title="@string/pref_title_pebble_forceprotocol"
                     android:summary="@string/pref_summary_pebble_forceprotocol" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="pebble_force_untested"
+                    android:title="@string/pref_title_pebble_forceuntested"
+                    android:summary="@string/pref_summary_pebble_forceuntested" />
             </PreferenceCategory>
         </PreferenceScreen>
     </PreferenceCategory>