diff --git a/client/api/events.ts b/client/api/events.ts
index 7a8d7415d..6f0968ef9 100644
--- a/client/api/events.ts
+++ b/client/api/events.ts
@@ -173,7 +173,7 @@ function update(original: IEventItem, updates: Partial<IEventItem>): Promise<Arr
     return superdeskApi.dataApi.patch<IEventItem>('events', original, {
         ...updates,
         associated_plannings: undefined,
-        embedded_planning: updates.associated_plannings.map((planning) => ({
+        embedded_planning: updates?.associated_plannings?.map((planning) => ({
             planning_id: planning._id.startsWith(TEMP_ID_PREFIX) ? undefined : planning._id,
             update_method: planning.update_method,
             coverages: planning.coverages.map((coverage) => ({
diff --git a/client/components/Main/CreateNewSubnavDropdown.tsx b/client/components/Main/CreateNewSubnavDropdown.tsx
index 28b05e443..be8d00a27 100644
--- a/client/components/Main/CreateNewSubnavDropdown.tsx
+++ b/client/components/Main/CreateNewSubnavDropdown.tsx
@@ -63,7 +63,9 @@ class CreateNewSubnavDropdownFn extends React.PureComponent<IProps> {
             const sortedTemplates = eventTemplates
                 .sort((templ1, templ2) => templ1.template_name.localeCompare(templ2.template_name));
 
-            recentTemplates
+            const templates = recentTemplates.length === 0 ? sortedTemplates : recentTemplates;
+
+            templates
                 .forEach((template) => {
                     items.push({
                         label: template.template_name,
@@ -74,7 +76,8 @@ class CreateNewSubnavDropdownFn extends React.PureComponent<IProps> {
                     });
                 });
 
-            if (sortedTemplates.length > MORE_TEMPLATES_THRESHOLD) {
+            if (recentTemplates.length < MORE_TEMPLATES_THRESHOLD ||
+                sortedTemplates.length > MORE_TEMPLATES_THRESHOLD) {
                 items.push({
                     label: gettext('More templates...'),
                     icon: 'icon-event icon--blue',