diff --git a/libnymea-app/types/paramtypes.h b/libnymea-app/types/paramtypes.h
index d0330e5f..1e5f6efe 100644
--- a/libnymea-app/types/paramtypes.h
+++ b/libnymea-app/types/paramtypes.h
@@ -54,7 +54,7 @@ public:
         ReadOnlyRole
     };
 
-    explicit ParamTypes(QObject *parent = 0);
+    explicit ParamTypes(QObject *parent = nullptr);
 
     QList<ParamType *> paramTypes();
 
diff --git a/nymea-app/ui/thingconfiguration/SetupWizard.qml b/nymea-app/ui/thingconfiguration/SetupWizard.qml
index 79a5b20f..61dbc57c 100644
--- a/nymea-app/ui/thingconfiguration/SetupWizard.qml
+++ b/nymea-app/ui/thingconfiguration/SetupWizard.qml
@@ -181,7 +181,6 @@ Page {
     Component {
         id: discoveryParamsPage
         Page {
-
             id: discoveryParamsView
 
             ColumnLayout {
@@ -385,6 +384,7 @@ Page {
                         delegate: ParamDelegate {
 //                            Layout.preferredHeight: 60
                             Layout.fillWidth: true
+                            enabled: !model.readOnly
                             paramType: root.deviceClass.paramTypes.get(index)
                             value: d.deviceDescriptor && d.deviceDescriptor.params.getParam(paramType.id) ?
                                        d.deviceDescriptor.params.getParam(paramType.id).value :