diff --git a/nymea-app/ui/devicepages/GenericThingPage.qml b/nymea-app/ui/devicepages/GenericThingPage.qml
index dcb51884..bcd31dc5 100644
--- a/nymea-app/ui/devicepages/GenericThingPage.qml
+++ b/nymea-app/ui/devicepages/GenericThingPage.qml
@@ -224,7 +224,9 @@ ThingPageBase {
                     if (stateDelegate.stateType.unit === Types.UnitUnixTime) {
                         sourceComp = "DateTimeDelegate.qml";
                     } else if (isWritable) {
-                        if (stateDelegate.stateType.minValue !== undefined && stateDelegate.stateType.maxValue !== undefined) {
+                        if (stateDelegate.stateType.allowedValues.length > 0) {
+                            sourceComp = "ComboBoxDelegate.qml";
+                        } else if (stateDelegate.stateType.minValue !== undefined && stateDelegate.stateType.maxValue !== undefined) {
                             sourceComp = "SliderDelegate.qml";
                         } else {
                             sourceComp = "SpinBoxDelegate.qml";