diff --git a/client/src/locales/fa/core.js b/client/src/locales/fa/core.js
index 2fb2fca8..358897fc 100644
--- a/client/src/locales/fa/core.js
+++ b/client/src/locales/fa/core.js
@@ -1,4 +1,8 @@
+import dateFns from 'date-fns/locale/fa-IR';
+
 export default {
+  dateFns,
+
   format: {
     date: 'M/d/yyyy',
     time: 'p',
diff --git a/client/src/locales/fa/index.js b/client/src/locales/fa/index.js
index f492e0f4..a03206be 100644
--- a/client/src/locales/fa/index.js
+++ b/client/src/locales/fa/index.js
@@ -1,11 +1,8 @@
-import merge from 'lodash/merge';
-
 import login from './login';
-import core from './core';
 
 export default {
   language: 'fa',
   country: 'ir',
   name: 'فارسی',
-  embeddedLocale: merge(login, core),
+  embeddedLocale: login,
 };
diff --git a/client/src/locales/index.js b/client/src/locales/index.js
index 89e79e07..3f8175eb 100644
--- a/client/src/locales/index.js
+++ b/client/src/locales/index.js
@@ -4,6 +4,7 @@ import da from './da';
 import de from './de';
 import en from './en';
 import es from './es';
+import fa from './fa';
 import fr from './fr';
 import hu from './hu';
 import id from './id';
@@ -21,7 +22,6 @@ import tr from './tr';
 import ua from './ua';
 import uz from './uz';
 import zh from './zh';
-import fa from './fa'
 
 const locales = [
   bg,
@@ -30,6 +30,7 @@ const locales = [
   de,
   en,
   es,
+  fa,
   fr,
   hu,
   id,
@@ -47,7 +48,6 @@ const locales = [
   ua,
   uz,
   zh,
-  fa
 ];
 
 export default locales;