diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 985431c0f..7314cb15c 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -525,6 +525,7 @@
 					if (!empty($settings->get('provision', 'path'))) {
 						$prov = new provision(['settings' => $settings]);
 						$prov->domain_uuid = $domain_uuid;
+						$prov->device_uuid = $device_uuid;
 						$response = $prov->write();
 					}
 
diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index a5f44ddc7..0c27a087c 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -54,6 +54,7 @@ class provision {
 	/**
 	 * declare public variables
 	 */
+	public $device_uuid;
 	public $template_dir;
 	public $device_address;
 	public $device_template;
@@ -1521,9 +1522,11 @@ class provision {
 
 		// get the devices from database
 		$sql = 'select * from v_devices ';
-		// $sql .= "where domain_uuid = :domain_uuid ";
-		// $parameters['domain_uuid'] = $this->domain_uuid;
-		$result = $this->database->select($sql, null, 'all');
+		$sql .= "where domain_uuid = :domain_uuid ";
+		$sql .= "and device_uuid = :device_uuid ";
+		$parameters['domain_uuid'] = $this->domain_uuid;
+		$parameters['device_uuid'] = $this->device_uuid;
+		$result = $this->database->select($sql, $parameters, 'all');
 
 		// process each device
 		if (is_array($result)) {