diff --git a/fastlane/metadata/android/en-US/changelogs/3162.txt b/fastlane/metadata/android/en-US/changelogs/3162.txt
index 7d8b96af7..385312c68 100644
--- a/fastlane/metadata/android/en-US/changelogs/3162.txt
+++ b/fastlane/metadata/android/en-US/changelogs/3162.txt
@@ -6,4 +6,5 @@ Changes:
 Bugfixes:
 - Export via KMZ did not export picture filenames correctly
 - Sharing multiple tracks did not include KMZ files
-- MarkerDetailActivity's UI was not shown
\ No newline at end of file
+- MarkerDetailActivity's UI was not shown
+- Settings crashed if preference of heart rate was not initialized
\ No newline at end of file
diff --git a/src/main/java/de/dennisguse/opentracks/settings/BluetoothLePreference.java b/src/main/java/de/dennisguse/opentracks/settings/BluetoothLePreference.java
index 49d2c56eb..6a8846f23 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/BluetoothLePreference.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/BluetoothLePreference.java
@@ -147,7 +147,7 @@ public class BluetoothLePreference extends DialogPreference {
 
             BluetoothLePreference preference = (BluetoothLePreference) getPreference();
             String deviceSelected = preference.getValue();
-            if (!deviceNone.equals(deviceSelected)) {
+            if (deviceSelected != null && !deviceNone.equals(deviceSelected)) {
                 listAdapter.add(preference.getValue(), preference.getValue());
                 selectedEntryIndex = 1;
             }