diff --git a/devices/tuya-generic-ds-w604-ble-light-switch.json b/devices/tuya-generic-ds-w604-ble-light-switch.json
new file mode 100644
index 00000000..e44c9378
--- /dev/null
+++ b/devices/tuya-generic-ds-w604-ble-light-switch.json
@@ -0,0 +1,148 @@
+{
+	"manufacturer": "Tuya Generic",
+	"name": "DS-W604 BLE Light Switch",
+	"key": "key5ckdnys3pqgec",
+	"ap_ssid": "SmartLife",
+	"github_issues": [],
+	"image_urls": [
+		"tuya-generic-ds-w604-ble-light-switch.jpg"
+	],
+	"profiles": [
+		"oem-bk7231n-dctrl-switch-1.1.0-sdk-2.3.1-40.00"
+	],
+	"schemas": {
+		"000004oozc": [
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 1
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 2
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 3
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 4
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 7
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 8
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 9
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 10
+			}
+		]
+	},
+	"device_configuration": {
+		"backlit_dp": 16,
+		"backlit_select": 0,
+		"bt1_lv": 0,
+		"bt1_pin": 9,
+		"bt2_lv": 0,
+		"bt2_pin": 8,
+		"bt3_lv": 0,
+		"bt3_pin": 7,
+		"bt4_lv": 0,
+		"bt4_pin": 10,
+		"bt_type": 1,
+		"cd_flag2": 1,
+		"ch_cddpid1": 7,
+		"ch_cddpid2": 8,
+		"ch_cddpid3": 9,
+		"ch_cddpid4": 10,
+		"ch_dpid1": 1,
+		"ch_dpid2": 2,
+		"ch_dpid3": 3,
+		"ch_dpid4": 4,
+		"ch_flag1": 1,
+		"ch_flag3": 1,
+		"ch_flag4": 1,
+		"ch_num": 4,
+		"crc": 9,
+		"cyc_dpid": 17,
+		"inch_dp": 19,
+		"init_conf": 14,
+		"jv": "1.1.0",
+		"led_dp": 15,
+		"light_status_select": 0,
+		"module": "CB3S",
+		"net_trig": 4,
+		"netled_lv": 0,
+		"netled_pin": 11,
+		"netn_led": 0,
+		"nety_led": 1,
+		"rand_dpid": 18,
+		"reset_t": 5,
+		"rl1_lv": 1,
+		"rl1_pin": 26,
+		"rl2_lv": 1,
+		"rl2_pin": 24,
+		"rl3_lv": 1,
+		"rl3_pin": 14,
+		"rl4_lv": 1,
+		"rl4_pin": 6,
+		"total_stat": 2,
+		"zero_select": 0
+	}
+}
diff --git a/images/tuya-generic-ds-w604-ble-light-switch.jpg b/images/tuya-generic-ds-w604-ble-light-switch.jpg
new file mode 100644
index 00000000..3d09c370
Binary files /dev/null and b/images/tuya-generic-ds-w604-ble-light-switch.jpg differ