diff --git a/custom_components/localtuya/pytuya/__init__.py b/custom_components/localtuya/pytuya/__init__.py
index 82a455e52..340154037 100644
--- a/custom_components/localtuya/pytuya/__init__.py
+++ b/custom_components/localtuya/pytuya/__init__.py
@@ -243,7 +243,7 @@ class DecodeError(Exception):
     DEV_TYPE_0D: {
          DP_QUERY: {  # Get Data Points from Device
             COMMAND_OVERRIDE: CONTROL_NEW,  # Uses CONTROL_NEW command for some reason
-            COMMAND: {PARAMETER_DEV_ID: "", PARAMETER_UID: "", PARAMETER_T: ""},
+            COMMAND: {PARAMETER_DEV_ID: "", PARAMETER_UID: "", PARAMETER_T: "", PARAMETER_CID: ""},
         },
         DP_QUERY_NEW: {
             COMMAND: {PARAMETER_CID: ""},
@@ -251,6 +251,10 @@ class DecodeError(Exception):
         HEART_BEAT: {
             COMMAND: {}
         },
+        CONTROL: {
+            COMMAND_OVERRIDE: CONTROL_NEW,
+            COMMAND: {PARAMETER_CID: "", "ctype": 0},
+        },
         CONTROL_NEW: {
             COMMAND: {PARAMETER_CID: "", "ctype": 0},
         },
@@ -266,7 +270,7 @@ class DecodeError(Exception):
             COMMAND: {PARAMETER_GW_ID: "", PARAMETER_DEV_ID: "", PARAMETER_UID: "" },
         },
         DP_QUERY_NEW: {
-            COMMAND: {PARAMETER_DEV_ID: "", PARAMETER_UID: "", PARAMETER_T: ""}
+            COMMAND: {PARAMETER_DEV_ID: "", PARAMETER_UID: "", PARAMETER_T: "", PARAMETER_CID: ""}
         },
         HEART_BEAT: {
             COMMAND: {PARAMETER_GW_ID: "", PARAMETER_DEV_ID: ""}