diff --git a/src/misc/arrayHelpers.ts b/src/misc/arrayHelpers.ts
index fe646a2..73f235e 100644
--- a/src/misc/arrayHelpers.ts
+++ b/src/misc/arrayHelpers.ts
@@ -1,4 +1,5 @@
-import { get, isEmpty } from 'lodash';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
 import { getFieldReferences, SearchObj } from './objectFlatten';
 
 export function sortArray(
diff --git a/src/misc/translate-from-firestore.ts b/src/misc/translate-from-firestore.ts
index 40a450d..2d9db96 100644
--- a/src/misc/translate-from-firestore.ts
+++ b/src/misc/translate-from-firestore.ts
@@ -1,5 +1,6 @@
 import { getDownloadURL, ref } from 'firebase/storage';
-import { has, set } from 'lodash';
+import has from 'lodash/has';
+import set from 'lodash/set';
 import { IFirebaseWrapper } from 'providers/database';
 import { FireStoreDocumentRef } from './firebase-models';
 import { REF_INDENTIFIER } from './internal.models';
diff --git a/src/providers/database/FireClient.ts b/src/providers/database/FireClient.ts
index 4589ef7..f522e2c 100644
--- a/src/providers/database/FireClient.ts
+++ b/src/providers/database/FireClient.ts
@@ -1,5 +1,6 @@
 import { doc } from 'firebase/firestore';
-import { get, set } from 'lodash';
+import get from 'lodash/get';
+import set from 'lodash/set';
 import {
   AddCreatedByFields,
   AddUpdatedByFields,