diff --git a/device/datastore.go b/device/datastore.go
index a3bf0628..15335b1c 100644
--- a/device/datastore.go
+++ b/device/datastore.go
@@ -75,7 +75,8 @@ var (
 	last_checkin,
 	dep_profile_status,
 	model,
-	workflow_uuid
+	workflow_uuid,
+	device_name
 	FROM devices`
 )
 
diff --git a/migrations/201606220002_devices_info_up.sql b/migrations/201606220002_devices_info_up.sql
index 333b0d08..a107fa88 100644
--- a/migrations/201606220002_devices_info_up.sql
+++ b/migrations/201606220002_devices_info_up.sql
@@ -1,4 +1,4 @@
 -- Add last_checkin, assume timestamp will be UTC
 ALTER TABLE devices
   ADD COLUMN last_checkin timestamp,
-  ADD COLUMN device_name text;
+  ADD COLUMN device_name text NOT NULL DEFAULT '';