diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp
index fff085194..cda52e722 100644
--- a/src/qt/qt_deviceconfig.cpp
+++ b/src/qt/qt_deviceconfig.cpp
@@ -123,7 +123,7 @@ DeviceConfig::ProcessConfig(void *dc, const void *c, const bool is_dep)
     if (config == NULL)
         return;
 
-    while (config->type != -1) {
+    while (config->type != CONFIG_END) {
         const int config_type = config->type & CONFIG_TYPE_MASK;
 
         /* Ignore options of the wrong class. */
@@ -376,7 +376,7 @@ DeviceConfig::ConfigureDevice(const _device_ *device, int instance, Settings *se
             return;
 
         config = device->config;
-        while (config->type != -1) {
+        while (config->type != CONFIG_END) {
             switch (config->type) {
                 default:
                     break;