diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md
index 2d7f13b0d..983180251 100644
--- a/CHANGES-4.3.md
+++ b/CHANGES-4.3.md
@@ -20,6 +20,7 @@ File format:
 ### Bug fixes
 
 * Fix case where publishing to a non-existent topic alias would crash the connection [#6979]
+* Fix HTTP-API 500 error on querying the lwm2m client list on the another node [#7009]
 
 ## v4.3.12
 ### Important changes
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src b/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
index b929ad854..717433c96 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
@@ -1,7 +1,8 @@
 {application,emqx_lwm2m,
-             [{description,"EMQ X LwM2M Gateway"},
-              {vsn, "4.3.5"}, % strict semver, bump manually!
-              {modules,[]},
-              {registered,[emqx_lwm2m_sup]},
-              {applications,[kernel,stdlib,lwm2m_coap]},
-              {mod,{emqx_lwm2m_app,[]}}]}.
+ [{description,"EMQ X LwM2M Gateway"},
+  {vsn, "4.3.6"}, % strict semver, bump manually!
+  {modules,[]},
+  {registered,[emqx_lwm2m_sup]},
+  {applications,[kernel,stdlib,lwm2m_coap]},
+  {mod,{emqx_lwm2m_app,[]}}]
+}.
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m.appup.src b/apps/emqx_lwm2m/src/emqx_lwm2m.appup.src
index c2b7e7bc4..e9f270397 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m.appup.src
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m.appup.src
@@ -4,13 +4,17 @@
     [{restart_application,emqx_lwm2m}]},
    {"4.3.2",
     [{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]},
-     {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}]},
-   {"4.3.3",[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}]},
-   {"4.3.4",[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}]}],
+     {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]},
+     {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]},
+   {<<"4\\.3\\.[3-5]">>,
+    [{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}],
   [{<<"4\\.3\\.[0-1]">>,
     [{restart_application,emqx_lwm2m}]},
    {"4.3.2",
     [{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]},
-     {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}]},
-   {"4.3.3",[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}]},
-   {"4.3.4",[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}]}]}.
+     {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]},
+     {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]},
+   {<<"4\\.3\\.[3-5]">>,
+    [{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}]}.
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_api.erl b/apps/emqx_lwm2m/src/emqx_lwm2m_api.erl
index 6018aa7c7..6e616fd1e 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m_api.erl
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m_api.erl
@@ -51,7 +51,7 @@
         ]).
 
 list(#{node := Node }, Params) ->
-    case Node = node() of
+    case Node =:= node() of
         true -> list(#{}, Params);
         _ -> rpc_call(Node, list, [#{}, Params])
     end;
@@ -61,7 +61,7 @@ list(#{}, _Params) ->
     return({ok, format(Channels)}).
 
 lookup_cmd(#{ep := Ep, node := Node}, Params) ->
-    case Node = node() of
+    case Node =:= node() of
         true -> lookup_cmd(#{ep => Ep}, Params);
         _ -> rpc_call(Node, lookup_cmd, [#{ep => Ep}, Params])
     end;