diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index 713432ca3..471b0e9f9 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -2,11 +2,13 @@ package de.dennisguse.opentracks.settings;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.util.Log;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
+import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -81,6 +83,7 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
             }
 
             setExportTrackFileFormatOptions();
+            setWheelCircumferenceInputFilter();
         }
 
         @Override
@@ -183,5 +186,20 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
             listPreference.setEntries(entries);
             listPreference.setEntryValues(entryValues);
         }
+
+        private void setWheelCircumferenceInputFilter() {
+            EditTextPreference wheelPreference = findPreference(getString(R.string.settings_sensor_bluetooth_cycling_speed_wheel_circumference_key));
+            wheelPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                if (newValue instanceof String) {
+                    try {
+                        int newValueInt = Integer.parseInt((String) newValue);
+                        return newValueInt > 500 && newValueInt < 4000;
+                    } catch (NumberFormatException e) {
+                        Log.w(TAG, "Entered string is no number.");
+                    }
+                }
+                return false;
+            });
+        }
     }
 }
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 47ba5f2ef..a9da05b10 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -362,7 +362,7 @@ g) udělejte, co si myslíte, že pomůže OpenTracks.</string>
     <string name="settings_sensor_connecting">Připojeno k senzoru %1$s</string>
     <string name="settings_sensor_disconnected">Odpojeno od %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Velikost kola (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Velikost kola (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Zeměpisná šířka/délka</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index f782a3a5c..383894a56 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -365,7 +365,7 @@ g) gør hvad du synes hjælper OpenTracks.</string>
     <string name="settings_sensor_connecting">Tilsluttet %1$s</string>
     <string name="settings_sensor_disconnected">Frakoblet %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Hjulstørrelse (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Hjulstørrelse (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Breddegrad/længdegrad</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 4f7cc86bf..c3ce50fc4 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -372,7 +372,7 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft.</string>
     <string name="settings_sensor_connecting">Verbunden mit %1$s</string>
     <string name="settings_sensor_disconnected">Verbindung getrennt von %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Reifengröße (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Reifengröße (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Breiten-/Längengrad</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 2d912712c..bb0e4993a 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -367,7 +367,7 @@ g) haz lo que creas que ayude a OpenTracks.</string>
     <string name="settings_sensor_connecting">Conectado a %1$s</string>
     <string name="settings_sensor_disconnected">Desconectado de %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Tamaño de la rueda (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Tamaño de la rueda (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitud/Longitud</string>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 1be55a9f2..92206e9ea 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -364,7 +364,7 @@ g) tehke kõike, mis teie arvates OpenTracks aitab.</string>
     <string name="settings_sensor_connecting">Ühendatud anduriga %1$s</string>
     <string name="settings_sensor_disconnected">Lahti ühendatud %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Ratta suurus (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Ratta suurus (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Laiuskraad/pikkuskraad</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 3dd2dcac8..32294e132 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -362,7 +362,7 @@ g) Egin uste duzu OpenTracks-ek laguntzen duela.</string>
     <string name="settings_sensor_connecting">Honekin konektatuta: %1$s</string>
     <string name="settings_sensor_disconnected">Deskonektatuta %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Gurpilaren tamaina (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Gurpilaren tamaina (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitudea/Longitudea</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index ff8ff7347..825650abb 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -375,7 +375,7 @@ jotta ne voidaan tuoda kohteeseen %1$s.</string>
     <string name="settings_sensor_connecting">Yhdistetty: %1$s</string>
     <string name="settings_sensor_disconnected">Yhteys katkaistu: %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Renkaan koko (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Renkaan koko (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Leveys-/pituusaste</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 57e2c00d6..f38c2dac8 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -366,7 +366,7 @@ g) faire tout ce qui vous semble utile à OpenTracks.</string>
     <string name="settings_sensor_connecting">Connecté à %1$s</string>
     <string name="settings_sensor_disconnected">Déconnecté de %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Taille des roues (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Taille des roues (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitude/Longitude</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 73837b518..0ac4952ce 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -373,7 +373,7 @@ g) calquera cousa que estimes axuda a OpenTracks.</string>
     <string name="settings_sensor_connecting">Conectado a %1$s</string>
     <string name="settings_sensor_disconnected">Desconectado de %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Tamaño da roda (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Tamaño da roda (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitude/lonxitude</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 33a80e3d9..f72ad8be5 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -366,7 +366,7 @@ g) doe wat je denkt dat OpenTracks helpt.</string>
     <string name="settings_sensor_connecting">Verbonden met %1$s</string>
     <string name="settings_sensor_disconnected">Ontkoppeld van %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Wielmaat (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Wielmaat (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Breedte-/lengtegraad</string>
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index b8faa8f6a..bc72b78a6 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -25,18 +25,6 @@
 
     <string name="settings_sensor_bluetooth_cycling_speed_wheel_circumference_key" translatable="false">bluetoothCyclingSpeedWheelCircumference</string>
     <string name="settings_sensor_bluetooth_cycling_speed_wheel_circumference_default" translatable="false">2135</string>
-    <string-array name="wheel_circumference_values">
-        <item>2100</item>
-        <item>2125</item>
-        <item>@string/settings_sensor_bluetooth_cycling_speed_wheel_circumference_default</item>
-        <item>2150</item>
-    </string-array>
-    <string-array name="wheel_circumference_options">
-        <item>20–622</item>
-        <item>23–622</item>
-        <item>25–622</item>
-        <item>28–622</item>
-    </string-array>
 
     <string name="default_activity_key" translatable="false">defaultActivity</string>
     <string name="default_activity_default" translatable="false">@string/activity_type_unknown</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 853c4bcce..0b4a2af54 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -384,7 +384,7 @@ limitations under the License.
     <string name="settings_sensor_connecting">Connected to %1$s</string>
     <string name="settings_sensor_disconnected">Disconnected from %1$s</string>
 
-    <string name="settings_sensor_wheel_circumference">Wheel size (ETRTO)</string>
+    <string name="settings_sensor_wheel_circumference">Wheel size (mm)</string>
 
     <!-- Settings Stats -->
     <string name="settings_stats_coordinate">Latitude/Longitude</string>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 2bb44b147..e35d87039 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -128,10 +128,9 @@ limitations under the License.
             android:defaultValue="@string/sensor_type_value_none"
             android:key="@string/settings_sensor_bluetooth_cycling_speed_key"
             android:title="@string/stats_speed" />
-        <ListPreference
+        <EditTextPreference
             android:defaultValue="@string/settings_sensor_bluetooth_cycling_speed_wheel_circumference_default"
-            android:entries="@array/wheel_circumference_options"
-            android:entryValues="@array/wheel_circumference_values"
+            android:inputType="number"
             android:key="@string/settings_sensor_bluetooth_cycling_speed_wheel_circumference_key"
             android:title="@string/settings_sensor_wheel_circumference"
             app:useSimpleSummaryProvider="true" />