diff --git a/lib/Gateway.js b/lib/Gateway.js
index 18e8127007..fe945f4d2f 100755
--- a/lib/Gateway.js
+++ b/lib/Gateway.js
@@ -1285,7 +1285,8 @@ Gateway.prototype.discoverClimates = function (node) {
 Gateway.prototype.discoverValue = function (node, vId) {
   const valueId = node.values[vId]
 
-  if (!valueId || this.discovered[valueId.id]) return
+  // if the node is not ready means we don't have all values added yet so we are not sure to discover this value properly
+  if (!valueId || this.discovered[valueId.id] || !node.ready) return
 
   try {
     const result = this.valueTopic(node, valueId, true)