diff --git a/schema/mysql-changes/upgrade_61.sql b/schema/mysql-changes/upgrade_61.sql
new file mode 100644
index 00000000..50d62fd5
--- /dev/null
+++ b/schema/mysql-changes/upgrade_61.sql
@@ -0,0 +1,2 @@
+ALTER TABLE icinga_host DROP KEY object_name, ADD UNIQUE KEY object_name (object_name);
+
diff --git a/schema/mysql.sql b/schema/mysql.sql
index ca48791b..d7d387cf 100644
--- a/schema/mysql.sql
+++ b/schema/mysql.sql
@@ -10,6 +10,9 @@
 -- icinga_validator_rule
 -- service-set
 
+-- Set DEFAULT 0xda39a3ee5e6b4b0d3255bfef95601890afd80709 for DEFAULT NULL?
+-- Set DEFAULT null-like entry in nullable relations
+
 
 SET sql_mode = 'STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,NO_ENGINE_SUBSTITUTION,PIPES_AS_CONCAT,ANSI_QUOTES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER';
 
@@ -403,7 +406,7 @@ CREATE TABLE icinga_host (
   master_should_connect ENUM('y', 'n') DEFAULT NULL,
   accept_config ENUM('y', 'n') DEFAULT NULL,
   PRIMARY KEY (id),
-  UNIQUE INDEX object_name (object_name, zone_id),
+  UNIQUE INDEX object_name (object_name),
   KEY search_idx (display_name),
   CONSTRAINT icinga_host_zone
     FOREIGN KEY zone (zone_id)