diff --git a/.homeychangelog.json b/.homeychangelog.json
index f8af6a83..1ccaa456 100644
--- a/.homeychangelog.json
+++ b/.homeychangelog.json
@@ -244,5 +244,8 @@
   },
   "3.0.40": {
     "en": "Added an \"Input x Has Changed\" trigger card for devices with inputs. Also added user friendly names for events in action event trigger cards and fixed an issue where Shelly Uni did not create a device for the second relay channel. Also renamed the temperature capability of Shelly Plug S to device temperature and remove obsolete input_1 capability of Shelly Button 1. Lastely deprecated the combined temperature and dim action card for the Shelly DUO as the can be achieved with two built in action cards."
+  },
+  "3.0.41": {
+    "en": "Added an \"Input x Has Changed\" trigger card for devices with inputs. Also added user friendly names for events in action event trigger cards and fixed an issue where Shelly Uni did not create a device for the second relay channel. Also renamed the temperature capability of Shelly Plug S to device temperature and remove obsolete input_1 capability of Shelly Button 1. Lastely deprecated the combined temperature and dim action card for the Shelly DUO as the can be achieved with two built in action cards."
   }
 }
diff --git a/.homeycompose/app.json b/.homeycompose/app.json
index a0d175ec..606037a4 100644
--- a/.homeycompose/app.json
+++ b/.homeycompose/app.json
@@ -62,7 +62,7 @@
       "Shelly Vintage"
     ]
   },
-  "version": "3.0.40",
+  "version": "3.0.41",
   "compatibility": ">=5.0.0",
   "author": {
     "name": "Jelger Haanstra",
diff --git a/app.json b/app.json
index 86e92b3d..e78bf4c7 100644
--- a/app.json
+++ b/app.json
@@ -63,7 +63,7 @@
       "Shelly Vintage"
     ]
   },
-  "version": "3.0.40",
+  "version": "3.0.41",
   "compatibility": ">=5.0.0",
   "author": {
     "name": "Jelger Haanstra",
diff --git a/drivers/device.js b/drivers/device.js
index 247cb56d..22f55569 100644
--- a/drivers/device.js
+++ b/drivers/device.js
@@ -885,7 +885,7 @@ class ShellyDevice extends Homey.Device {
           }
           break;
         case 'inputEvent0':
-          if (this.hasCapability('input_1') && this.hasCapability('input_2')) {
+          if (this.hasCapability('input_1') && this.hasCapability('input_2') && !this.getStoreValue('type') === 'SHIX3-1') {
             let actionEvent1 = this.util.getActionEventDescription(value) + '_1';
             this.setStoreValue('actionEvent1', actionEvent1);
           } else {
@@ -894,7 +894,7 @@ class ShellyDevice extends Homey.Device {
           }
           break;
         case 'inputEvent1':
-          if (this.hasCapability('input_1') && this.hasCapability('input_2')) {
+          if (this.hasCapability('input_1') && this.hasCapability('input_2') && !this.getStoreValue('type') === 'SHIX3-1') {
             let actionEvent2 = this.util.getActionEventDescription(value) + '_2';
             this.setStoreValue('actionEvent2', actionEvent2);
           } else {
@@ -903,7 +903,7 @@ class ShellyDevice extends Homey.Device {
           }
           break;
         case 'inputEvent2':
-          let actionEvent3 = this.util.getActionEventDescription(value) + '_3';
+          let actionEvent3 = this.util.getActionEventDescription(value);
           this.setStoreValue('actionEvent3', actionEvent3);
           break;
         case 'inputEventCounter0':
diff --git a/package-lock.json b/package-lock.json
index 8539d16e..8768f4b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cloud.shelly",
-  "version": "3.0.40",
+  "version": "3.0.41",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2443303b..68dbbc6b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cloud.shelly",
-  "version": "3.0.40",
+  "version": "3.0.41",
   "description": "Homey app for controlling Shelly devices",
   "main": "app.js",
   "scripts": {