diff --git a/frappe/public/js/frappe-web.bundle.js b/frappe/public/js/frappe-web.bundle.js
index c962457964..b8d4006090 100644
--- a/frappe/public/js/frappe-web.bundle.js
+++ b/frappe/public/js/frappe-web.bundle.js
@@ -2,6 +2,7 @@ import "./jquery-bootstrap";
 import "./frappe/class.js";
 import "./frappe/polyfill.js";
 import "./lib/md5.min.js";
+import "./lib/moment.js";
 import "./frappe/provide.js";
 import "./frappe/format.js";
 import "./frappe/utils/number_format.js";
diff --git a/frappe/public/js/frappe/utils/datetime.js b/frappe/public/js/frappe/utils/datetime.js
index beffa11331..196bdf68a3 100644
--- a/frappe/public/js/frappe/utils/datetime.js
+++ b/frappe/public/js/frappe/utils/datetime.js
@@ -1,8 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
-import moment from "moment/min/moment-with-locales.js";
-
 frappe.provide('frappe.datetime');
 
 frappe.defaultDateFormat = "YYYY-MM-DD";
diff --git a/frappe/public/js/lib/moment.js b/frappe/public/js/lib/moment.js
new file mode 100644
index 0000000000..7a817a36cd
--- /dev/null
+++ b/frappe/public/js/lib/moment.js
@@ -0,0 +1,5 @@
+// This file is used to make sure that `moment` is bound to the window
+// before the bundle finishes loading, due to imports (datetime.js) in the bundle
+// that depend on `moment`.
+import momentTimezone from "moment-timezone/builds/moment-timezone-with-data.js";
+window.moment = momentTimezone;
diff --git a/frappe/public/js/libs.bundle.js b/frappe/public/js/libs.bundle.js
index 876d76875b..b71cc592a0 100644
--- a/frappe/public/js/libs.bundle.js
+++ b/frappe/public/js/libs.bundle.js
@@ -1,15 +1,12 @@
 import "./jquery-bootstrap";
 import Vue from "vue/dist/vue.esm.js";
-import moment from "moment/min/moment-with-locales.js";
-import momentTimezone from "moment-timezone/builds/moment-timezone-with-data.js";
+import "./lib/moment";
 import io from "socket.io-client/dist/socket.io.slim.js";
 import Sortable from "./lib/Sortable.min.js";
 // TODO: esbuild
 // Don't think jquery.hotkeys is being used anywhere. Will remove this after being sure.
 // import "./lib/jquery/jquery.hotkeys.js";
 
-window.moment = moment;
-window.moment = momentTimezone;
 window.Vue = Vue;
 window.Sortable = Sortable;
 window.io = io;