diff --git a/migrations/201606240001_devices_defaults_down.sql b/migrations/201606240001_devices_defaults_down.sql
new file mode 100644
index 00000000..b51a931d
--- /dev/null
+++ b/migrations/201606240001_devices_defaults_down.sql
@@ -0,0 +1,11 @@
+ALTER TABLE devices
+  ALTER COLUMN last_query_response DROP NOT NULL,
+  ALTER COLUMN build_version DROP NOT NULL,
+  ALTER COLUMN product_name DROP NOT NULL,
+  ALTER COLUMN os_version DROP NOT NULL;
+
+ALTER TABLE devices
+  ALTER COLUMN last_query_response DROP DEFAULT,
+  ALTER COLUMN build_version DROP DEFAULT,
+  ALTER COLUMN product_name DROP DEFAULT,
+  ALTER COLUMN os_version DROP DEFAULT;
diff --git a/migrations/201606240001_devices_defaults_up.sql b/migrations/201606240001_devices_defaults_up.sql
new file mode 100644
index 00000000..3af03626
--- /dev/null
+++ b/migrations/201606240001_devices_defaults_up.sql
@@ -0,0 +1,12 @@
+ALTER TABLE devices
+    ALTER COLUMN last_query_response SET DEFAULT '{}',
+    ALTER COLUMN build_version SET DEFAULT '',
+    ALTER COLUMN product_name SET DEFAULT '',
+    ALTER COLUMN os_version SET DEFAULT '';
+
+ALTER TABLE devices
+  ALTER COLUMN last_query_response SET NOT NULL,
+  ALTER COLUMN build_version SET NOT NULL,
+  ALTER COLUMN product_name SET NOT NULL,
+  ALTER COLUMN os_version SET NOT NULL;
+