diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index fbbaca7a3..bae74dfa2 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.7.18
+ - fixed #10804: EMS Schedule Screen broken
  - fixed: Logging errors when getting the list of available driver classes.
  - fixed #10797: Unable to search for non-ASCII text
  - fixed #10800: Ogone payment driver typo
diff --git a/docs/upgrades/upgrade_7.7.17-7.7.18.pl b/docs/upgrades/upgrade_7.7.17-7.7.18.pl
index 55b53b5e8..55f45eb8d 100644
--- a/docs/upgrades/upgrade_7.7.17-7.7.18.pl
+++ b/docs/upgrades/upgrade_7.7.17-7.7.18.pl
@@ -35,6 +35,7 @@ addSmsGatewaySubjectSetting($session);
 addInboxNotificationsSubjectSetting($session);
 profileFieldRequiredEditable($session);
 deleteOldInboxMessageStates($session);
+setDefaultEMSScheduleTemplate($session);
 finish($session); # this line required
 
 #----------------------------------------------------------------------------
@@ -46,6 +47,15 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+sub setDefaultEMSScheduleTemplate {
+    my $session = shift;
+    print "\tSet the default EMS schedule template on existing EMS'es that do not have one... " unless $quiet;
+    $session->db->write(<<EOSQL);
+update EventManagementSystem set scheduleTemplateId='S2_LsvVa95OSqc66ITAoig' where scheduleTemplateId IS NULL;
+EOSQL
+    print "DONE!\n" unless $quiet;
+}
+
 sub deleteOldInboxMessageStates {
     my $session = shift;
     print "\tDelete Inbox messages states for users who have been deleted... " unless $quiet;