diff --git a/www/class/config-generate-remote/Generate.php b/www/class/config-generate-remote/Generate.php
index ae493fe5df5..e995da22e65 100644
--- a/www/class/config-generate-remote/Generate.php
+++ b/www/class/config-generate-remote/Generate.php
@@ -145,8 +145,16 @@ private function getPollerFromId(int $pollerId)
     private function getPollersFromRemote(int $remoteId)
     {
         $stmt = $this->backendInstance->db->prepare(
-            "SELECT * FROM nagios_server
-            WHERE remote_id = :remote_id"
+            "SELECT ns1.*
+            FROM nagios_server AS ns1
+            WHERE ns1.remote_id = :remote_id
+            GROUP BY ns1.id
+            UNION
+            SELECT ns2.*
+            FROM nagios_server AS ns2
+            INNER JOIN rs_poller_relation AS rspr ON rspr.poller_server_id = ns2.id
+            AND rspr.remote_server_id = :remote_id
+            GROUP BY ns2.id"
         );
         $stmt->bindParam(':remote_id', $remoteId, PDO::PARAM_INT);
         $stmt->execute();
diff --git a/www/include/configuration/configServers/formServers.php b/www/include/configuration/configServers/formServers.php
index 5db79edfc04..c12885ba566 100644
--- a/www/include/configuration/configServers/formServers.php
+++ b/www/include/configuration/configServers/formServers.php
@@ -102,7 +102,7 @@
                 );
             }
         }
-        $dbResult->closeCursor();
+        $statement->closeCursor();
     }
 }