diff --git a/src/inc/enc.php b/src/inc/enc.php
index 58280c2bb09ab262986a331bebca6bc7e036b182..7c65b60d960e0f3f04f7461592fd2f171efe3a6e 100644
--- a/src/inc/enc.php
+++ b/src/inc/enc.php
@@ -551,7 +551,7 @@ function puppet_enc($con,$conf){
         }else{
             $qrole = 'controller';
         }
-        $q = "SELECT machines.hostname AS hostname, machines.id AS nodeid, INET_NTOA(ips.ip) AS ipaddr FROM machines, ips, networks WHERE machines.role='$qrole' AND machines.id=ips.machine AND ips.network=networks.id AND networks.is_public='no' AND networks.role!='vm-net' AND networks.role!='ovs-bridge' AND networks.role!='ceph-cluster' AND networks.role!='ipmi'";
+        $q = "SELECT machines.hostname AS hostname, machines.id AS nodeid, INET_NTOA(ips.ip) AS ipaddr FROM machines, ips, networks WHERE machines.role='$qrole' AND machines.cluster='$cluster_id' AND machines.id=ips.machine AND ips.network=networks.id AND networks.is_public='no' AND networks.role!='vm-net' AND networks.role!='ovs-bridge' AND networks.role!='ceph-cluster' AND networks.role!='ipmi'";
         $r = mysqli_query($con, $q);
         if($r === FALSE){
             $json["status"] = "error";
@@ -571,7 +571,7 @@ function puppet_enc($con,$conf){
 
         $enc_non_master_sql = "      non_master_sql:\n";
         $enc_non_master_sql_ip = "      non_master_sql_ip:\n";
-        $q = "SELECT machines.hostname AS hostname, machines.id AS nodeid, INET_NTOA(ips.ip) AS ipaddr FROM machines, ips, networks WHERE machines.role='$qrole' AND machines.id=ips.machine AND ips.network=networks.id AND networks.is_public='no' AND networks.role!='vm-net' AND networks.role!='ovs-bridge' AND networks.role!='ceph-cluster' AND networks.role!='ipmi' AND machines.hostname!='$first_sql_hostname'";
+        $q = "SELECT machines.hostname AS hostname, machines.id AS nodeid, INET_NTOA(ips.ip) AS ipaddr FROM machines, ips, networks WHERE machines.role='$qrole' AND machines.cluster='$cluster_id' AND machines.id=ips.machine AND ips.network=networks.id AND networks.is_public='no' AND networks.role!='vm-net' AND networks.role!='ovs-bridge' AND networks.role!='ceph-cluster' AND networks.role!='ipmi' AND machines.hostname!='$first_sql_hostname'";
         $r = mysqli_query($con, $q);
         if($r === FALSE){
             $json["status"] = "error";