diff --git a/pym/update/update.py b/pym/update/update.py
index 0e58e24..32ab318 100644
--- a/pym/update/update.py
+++ b/pym/update/update.py
@@ -1618,6 +1618,9 @@ class Update(MethodsInterface):
     def create_binhost_data(self):
         dv = self.clVars
         last_ts = dv.Get('cl_update_last_timestamp')
+        if not dv.Get('update.cl_update_binhost') and not dv.Get('update.cl_update_binhost_choice'):
+            dv.Write('cl_update_binhost_set', "off")
+            dv.Set('cl_update_binhost_set', 'off')
         if (not dv.Get('update.cl_update_binhost_choice') and not dv.GetBool('update.cl_update_binhost_set')) \
                 or dv.Get('update.cl_update_binhost_choice') == 'auto':
             if dv.Get('cl_update_binhost_stable_opt_set'):
diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py
index 7ae6a7e..91fe97b 100644
--- a/pym/update/variables/update.py
+++ b/pym/update/variables/update.py
@@ -340,6 +340,11 @@ class VariableClUpdateBinhostSet(Variable):
     type = "bool"
     value = 'off'
 
+    def get(self):
+        if self.Get('cl_update_binhost'):
+            return self.value
+        return 'off'
+
 
 class VariableClUpdateBinhostsInfo(ReadonlyVariable):
     """