diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 79797f5560..771f87a968 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -540,7 +540,9 @@ frappe.ui.form.Form = class FrappeForm {
 
 				me.script_manager.trigger("after_save");
 				// submit comment if entered
-				me.timeline.comment_area.submit();
+				if (me.timeline) {
+					me.timeline.comment_area.submit();
+				}
 				me.refresh();
 			} else {
 				if(on_error) {
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index 82fef18367..d8b298cb35 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -722,7 +722,9 @@ _f.Frm.prototype._save = function(save_action, callback, btn, on_error, resolve,
 
 			me.script_manager.trigger("after_save");
 			// submit comment if entered
-			me.timeline.comment_area.submit();
+			if (me.timeline) {
+				me.timeline.comment_area.submit();
+			}
 			me.refresh();
 		} else {
 			if (on_error) {