diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 3219a113c..260147fa2 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -691,7 +691,7 @@ CREATE INDEX `Servers_Name_idx` ON `Servers` (`Name`);
 DROP TABLE IF EXISTS `Server_Stats`;
 CREATE TABLE `Server_Stats` (
   `Id` int(10) unsigned NOT NULL auto_increment,
-  `ServerId`  int(10) unsigned NOT NULL,
+  `ServerId`  int(10) unsigned,
   `TimeStamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   `CpuLoad` DECIMAL(5,1) default NULL,
   `TotalMem` bigint unsigned default null,
diff --git a/db/zm_update-1.37.32.sql b/db/zm_update-1.37.32.sql
index b6ca6dc73..663c21228 100644
--- a/db/zm_update-1.37.32.sql
+++ b/db/zm_update-1.37.32.sql
@@ -12,7 +12,7 @@ SET @s = (SELECT IF(
 "SELECT 'Server_Stats table exists'",
 "CREATE TABLE `Server_Stats` (
   `Id` int(10) unsigned NOT NULL auto_increment,
-  `ServerId`  int(10) unsigned NOT NULL,
+  `ServerId`  int(10) unsigned,
   `TimeStamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   `CpuLoad` DECIMAL(5,1) default NULL,
   `TotalMem` bigint unsigned default null,