diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 75ceff64a..f651ced50 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -284,7 +284,7 @@ CREATE TABLE Monitors (
   AlarmFrameCount smallint(5) unsigned NOT NULL default '1',
   SectionLength int(10) unsigned NOT NULL default '600',
   FrameSkip smallint(5) unsigned NOT NULL default '0',
-  MaxFPS decimal(5,2) NOT NULL default '0.00',
+  MaxFPS decimal(5,2) default NULL,
   FPSReportInterval smallint(5) unsigned NOT NULL default '250',
   RefBlendPerc tinyint(3) unsigned NOT NULL default '10',
   Controllable tinyint(3) unsigned NOT NULL default '0',
diff --git a/db/zm_update-1.22.0.sql b/db/zm_update-1.22.0.sql
index 40b248946..ac4e28902 100644
--- a/db/zm_update-1.22.0.sql
+++ b/db/zm_update-1.22.0.sql
@@ -12,6 +12,8 @@ alter table Monitors modify column Port varchar(8) not null default '';
 alter table Monitors modify column Path varchar(255) not null default '';
 alter table Monitors modify column LabelX smallint(5) unsigned not null default 0;
 alter table Monitors modify column LabelY smallint(5) unsigned not null default 0;
+alter table Monitors modify column MaxFPS decimal(5,2) default NULL;
+update Monitors set MaxFPS = NULL where MaxFPS = 0.00; 
 
 --
 -- Modify zone presets a bit