diff --git a/src/headless/core.js b/src/headless/core.js
index feab4ace4..93dbc2ac3 100644
--- a/src/headless/core.js
+++ b/src/headless/core.js
@@ -6,11 +6,11 @@ import Storage from '@converse/skeletor/src/storage.js';
 import _converse from '@converse/headless/shared/_converse';
 import advancedFormat from 'dayjs/plugin/advancedFormat';
 import dayjs from 'dayjs';
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import i18n from '@converse/headless/shared/i18n';
-import invoke from 'lodash/invoke';
-import isFunction from 'lodash/isFunction';
-import isObject from 'lodash/isObject';
+import invoke from 'lodash-es/invoke';
+import isFunction from 'lodash-es/isFunction';
+import isObject from 'lodash-es/isObject';
 import localDriver from 'localforage-webextensionstorage-driver/local';
 import log from '@converse/headless/log';
 import pluggable from 'pluggable.js/src/pluggable.js';
diff --git a/src/headless/plugins/chat/model.js b/src/headless/plugins/chat/model.js
index dcbddc231..830b23dad 100644
--- a/src/headless/plugins/chat/model.js
+++ b/src/headless/plugins/chat/model.js
@@ -1,9 +1,9 @@
 import ModelWithContact from './model-with-contact.js';
 import filesize from "filesize";
-import isMatch from "lodash/isMatch";
-import isObject from "lodash/isObject";
+import isMatch from "lodash-es/isMatch";
+import isObject from "lodash-es/isObject";
 import log from '@converse/headless/log';
-import pick from "lodash/pick";
+import pick from "lodash-es/pick";
 import { Model } from '@converse/skeletor/src/model.js';
 import { _converse, api, converse } from "../../core.js";
 import { getOpenPromise } from '@converse/openpromise';
diff --git a/src/headless/plugins/roster/contacts.js b/src/headless/plugins/roster/contacts.js
index 237e4a7bc..a9b2414be 100644
--- a/src/headless/plugins/roster/contacts.js
+++ b/src/headless/plugins/roster/contacts.js
@@ -1,6 +1,6 @@
 import RosterContact from './contact.js';
 import log from "@converse/headless/log";
-import sum from 'lodash/sum';
+import sum from 'lodash-es/sum';
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from "@converse/skeletor/src/model";
 import { __ } from 'i18n';
diff --git a/src/headless/plugins/roster/index.js b/src/headless/plugins/roster/index.js
index 0a5357210..904ee20a4 100644
--- a/src/headless/plugins/roster/index.js
+++ b/src/headless/plugins/roster/index.js
@@ -5,7 +5,7 @@
 import "@converse/headless/plugins/status";
 import RosterContact from './contact.js';
 import RosterContacts from './contacts.js';
-import invoke from 'lodash/invoke';
+import invoke from 'lodash-es/invoke';
 import log from "@converse/headless/log";
 import roster_api from './api.js';
 import { Presence, Presences } from './presence.js';
diff --git a/src/headless/plugins/roster/presence.js b/src/headless/plugins/roster/presence.js
index a93b424a7..6a245045e 100644
--- a/src/headless/plugins/roster/presence.js
+++ b/src/headless/plugins/roster/presence.js
@@ -1,4 +1,4 @@
-import isNaN from "lodash/isNaN";
+import isNaN from "lodash-es/isNaN";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
 import { converse } from "@converse/headless/core";
diff --git a/src/headless/shared/connection.js b/src/headless/shared/connection.js
index d1c36790b..b1675a36d 100644
--- a/src/headless/shared/connection.js
+++ b/src/headless/shared/connection.js
@@ -1,5 +1,5 @@
-import debounce from 'lodash/debounce';
-import isElement from 'lodash/isElement';
+import debounce from 'lodash-es/debounce';
+import isElement from 'lodash-es/isElement';
 import log from "../log.js";
 import sizzle from 'sizzle';
 import { Strophe } from 'strophe.js/src/core';
diff --git a/src/headless/shared/rsm.js b/src/headless/shared/rsm.js
index 3532db73c..29c1ecb9b 100644
--- a/src/headless/shared/rsm.js
+++ b/src/headless/shared/rsm.js
@@ -7,7 +7,7 @@
  *   Copyright 2006-2017 Strophe (https://github.com/strophe/strophejs)
  */
 import { _converse, converse } from "../core.js";
-import pick from 'lodash/pick';
+import pick from 'lodash-es/pick';
 
 const { Strophe, $build } = converse.env;
 
diff --git a/src/headless/shared/settings.js b/src/headless/shared/settings.js
index 2aac9f4a0..1b0a753f9 100644
--- a/src/headless/shared/settings.js
+++ b/src/headless/shared/settings.js
@@ -1,8 +1,8 @@
 import _converse from '@converse/headless/shared/_converse';
-import assignIn from 'lodash/assignIn';
-import isObject from 'lodash/isObject';
+import assignIn from 'lodash-es/assignIn';
+import isObject from 'lodash-es/isObject';
 import log from '@converse/headless/log';
-import pick from 'lodash/pick';
+import pick from 'lodash-es/pick';
 import u from '@converse/headless/utils/core';
 import { Model } from '@converse/skeletor/src/model.js';
 import { initStorage } from '@converse/headless/shared/utils.js';
diff --git a/src/plugins/chatview/heading.js b/src/plugins/chatview/heading.js
index a61af3c49..87e1fc52c 100644
--- a/src/plugins/chatview/heading.js
+++ b/src/plugins/chatview/heading.js
@@ -1,5 +1,5 @@
 import UserDetailsModal from 'modals/user-details.js';
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import tpl_chatbox_head from './templates/chat-head.js';
 import { ElementView } from '@converse/skeletor/src/element.js';
 import { __ } from 'i18n';
diff --git a/src/plugins/muc-views/bottom-panel.js b/src/plugins/muc-views/bottom-panel.js
index ee2a256a7..cc0ef7c60 100644
--- a/src/plugins/muc-views/bottom-panel.js
+++ b/src/plugins/muc-views/bottom-panel.js
@@ -1,6 +1,6 @@
 import 'shared/autocomplete/index.js';
 import BottomPanel from 'plugins/chatview/bottom-panel.js';
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import tpl_muc_bottom_panel from './templates/muc-bottom-panel.js';
 import { __ } from 'i18n';
 import { _converse, api, converse } from "@converse/headless/core";
diff --git a/src/plugins/muc-views/heading.js b/src/plugins/muc-views/heading.js
index a7d5fc350..f6b25e3d6 100644
--- a/src/plugins/muc-views/heading.js
+++ b/src/plugins/muc-views/heading.js
@@ -1,7 +1,7 @@
 import ChatHeading from 'plugins/chatview/heading.js';
 import MUCInviteModal from 'modals/muc-invite.js';
 import RoomDetailsModal from 'modals/muc-details.js';
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import tpl_muc_head from './templates/muc-head.js';
 import { Model } from '@converse/skeletor/src/model.js';
 import { __ } from 'i18n';
diff --git a/src/plugins/rosterview/rosterview.js b/src/plugins/rosterview/rosterview.js
index ba9386de0..b933ae3b4 100644
--- a/src/plugins/rosterview/rosterview.js
+++ b/src/plugins/rosterview/rosterview.js
@@ -1,4 +1,4 @@
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import tpl_roster from "./templates/roster.js";
 import { ElementView } from "@converse/skeletor/src/element";
 import { Model } from '@converse/skeletor/src/model.js';
diff --git a/src/shared/chat/baseview.js b/src/shared/chat/baseview.js
index adb653de0..c0f3e58d2 100644
--- a/src/shared/chat/baseview.js
+++ b/src/shared/chat/baseview.js
@@ -1,4 +1,4 @@
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import log from '@converse/headless/log';
 import tpl_spinner from 'templates/spinner.js';
 import { ElementView } from '@converse/skeletor/src/element.js';
diff --git a/src/shared/chat/chat-content.js b/src/shared/chat/chat-content.js
index 73c3066ed..386041bb8 100644
--- a/src/shared/chat/chat-content.js
+++ b/src/shared/chat/chat-content.js
@@ -1,5 +1,5 @@
 import "./message-history";
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import { CustomElement } from 'shared/components/element.js';
 import { _converse, api } from "@converse/headless/core";
 import { html } from 'lit';
diff --git a/src/shared/chat/emoji-picker.js b/src/shared/chat/emoji-picker.js
index 743818c3b..4a35f674a 100644
--- a/src/shared/chat/emoji-picker.js
+++ b/src/shared/chat/emoji-picker.js
@@ -1,6 +1,6 @@
 import "./emoji-picker-content.js";
 import DOMNavigator from "shared/dom-navigator";
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import { BaseDropdown } from "shared/components/dropdown.js";
 import { CustomElement } from 'shared/components/element.js';
 import { __ } from 'i18n';