diff --git a/device/datastore.go b/device/datastore.go
index b4b9a4f0..a46e1b9b 100644
--- a/device/datastore.go
+++ b/device/datastore.go
@@ -27,7 +27,7 @@ var (
 	dep_device
 	) 
 	VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
-	ON CONFLICT (serial_number)
+	ON CONFLICT (udid, serial_number)
 	DO UPDATE SET
 	model = $2,
 	description = $3,