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/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;
diff --git a/frappe/public/js/web_form.bundle.js b/frappe/public/js/web_form.bundle.js
index 01969a489c..ffb7b824bd 100644
--- a/frappe/public/js/web_form.bundle.js
+++ b/frappe/public/js/web_form.bundle.js
@@ -1,2 +1,3 @@
+import "./lib/moment.js";
 import "./frappe/utils/datetime.js";
 import "./frappe/web_form/webform_script.js";
diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index bc1f802cf7..8d892b5de6 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -105,8 +105,6 @@
 		// for backward compatibility of some libs
 		frappe.sys_defaults = frappe.boot.sysdefaults;
 	</script>
-	<script type="text/javascript" src="/assets/frappe/node_modules/moment/min/moment-with-locales.min.js"></script>
-	<script type="text/javascript" src="/assets/frappe/node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"></script>
 	{{ include_script('frappe-web.bundle.js') }}
 	{% endblock %}
 
diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html
index a8666b55e9..72cdf07c59 100644
--- a/frappe/website/doctype/web_form/templates/web_form.html
+++ b/frappe/website/doctype/web_form/templates/web_form.html
@@ -92,18 +92,12 @@ $(".file-size").each(function() {
 });
 </script>
 {{ include_script("controls.bundle.js") }}
-{% if is_list %}
-{# web form list #}
-<script type="text/javascript" src="/assets/frappe/node_modules/moment/min/moment-with-locales.min.js"></script>
-<script type="text/javascript" src="/assets/frappe/node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"></script>
+{% if is_list %} <!-- web form list -->
 {{ include_script("dialog.bundle.js") }}
 {{ include_script("web_form.bundle.js") }}
 {{ include_script("bootstrap-4-web.bundle.js") }}
-{% else %}
-{# web form #}
+{% else %} <!-- web form -->
 {{ include_script("dialog.bundle.js") }}
-<script type="text/javascript" src="/assets/frappe/node_modules/moment/min/moment-with-locales.min.js"></script>
-<script type="text/javascript" src="/assets/frappe/node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"></script>
 <script type="text/javascript" src="/assets/frappe/node_modules/vue/dist/vue.js"></script>
 <script>
 	Vue.prototype.__ = window.__;