diff --git a/db/zm_update-1.30.7.sql b/db/zm_update-1.30.7.sql
index 06d829c88..72641825b 100644
--- a/db/zm_update-1.30.7.sql
+++ b/db/zm_update-1.30.7.sql
@@ -4,5 +4,7 @@
 -- Changing StorageId to be NOT NULL and default 0
 --
 
+UPDATE Monitors SET StorageId = 0 WHERE StorageId IS NULL;
 ALTER TABLE Monitors MODIFY `StorageId`	smallint(5) unsigned NOT NULL default 0;
+UPDATE Events SET StorageId = 0 WHERE StorageId IS NULL;
 ALTER TABLE Events MODIFY `StorageId`	smallint(5) unsigned NOT NULL default 0;