diff --git a/autotests/libinput/device_test.cpp b/autotests/libinput/device_test.cpp
index 27aba83fce..fc08294396 100644
--- a/autotests/libinput/device_test.cpp
+++ b/autotests/libinput/device_test.cpp
@@ -386,9 +386,9 @@ void TestLibinputDevice::testTapEnabledByDefault()
     device.tapEnabledByDefault = enabled;
 
     Device d(&device);
-    QCOMPARE(d.tapToClickEnabledByDefault(), enabled);
-    QCOMPARE(d.property("tapToClickEnabledByDefault").toBool(), enabled);
-    QCOMPARE(dbusProperty<bool>(d.sysName(), "tapToClickEnabledByDefault"), enabled);
+    QCOMPARE(d.tapToClickEnabledByDefault(), true);
+    QCOMPARE(d.property("tapToClickEnabledByDefault").toBool(), true);
+    QCOMPARE(dbusProperty<bool>(d.sysName(), "tapToClickEnabledByDefault"), true);
 }
 
 void TestLibinputDevice::testMiddleEmulationEnabledByDefault_data()
@@ -1114,9 +1114,9 @@ void TestLibinputDevice::testTapAndDragEnabledByDefault()
     device.tapAndDragEnabledByDefault = enabled;
 
     Device d(&device);
-    QCOMPARE(d.tapAndDragEnabledByDefault(), enabled);
-    QCOMPARE(d.property("tapAndDragEnabledByDefault").toBool(), enabled);
-    QCOMPARE(dbusProperty<bool>(d.sysName(), "tapAndDragEnabledByDefault"), enabled);
+    QCOMPARE(d.tapAndDragEnabledByDefault(), true);
+    QCOMPARE(d.property("tapAndDragEnabledByDefault").toBool(), true);
+    QCOMPARE(dbusProperty<bool>(d.sysName(), "tapAndDragEnabledByDefault"), true);
 }
 
 void TestLibinputDevice::testTapAndDrag_data()
diff --git a/src/backends/libinput/device.cpp b/src/backends/libinput/device.cpp
index f313ace4e7..ad9275def6 100644
--- a/src/backends/libinput/device.cpp
+++ b/src/backends/libinput/device.cpp
@@ -285,9 +285,9 @@ Device::Device(libinput_device *device, QObject *parent)
     , m_tapFingerCount(libinput_device_config_tap_get_finger_count(m_device))
     , m_defaultTapButtonMap(libinput_device_config_tap_get_default_button_map(m_device))
     , m_tapButtonMap(libinput_device_config_tap_get_button_map(m_device))
-    , m_tapToClickEnabledByDefault(libinput_device_config_tap_get_default_enabled(m_device) == LIBINPUT_CONFIG_TAP_ENABLED)
+    , m_tapToClickEnabledByDefault(true)
     , m_tapToClick(libinput_device_config_tap_get_enabled(m_device))
-    , m_tapAndDragEnabledByDefault(libinput_device_config_tap_get_default_drag_enabled(m_device))
+    , m_tapAndDragEnabledByDefault(true)
     , m_tapAndDrag(libinput_device_config_tap_get_drag_enabled(m_device))
     , m_tapDragLockEnabledByDefault(libinput_device_config_tap_get_default_drag_lock_enabled(m_device))
     , m_tapDragLock(libinput_device_config_tap_get_drag_lock_enabled(m_device))