diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
index e3da7828..3d46ba6a 100644
--- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
+++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
@@ -264,7 +264,7 @@
                         matSuffix
                         [for]="picker"
                       ></mat-datepicker-toggle>
-                      <mat-datepicker  [disabled]="!isEditable && id" #picker></mat-datepicker>
+                      <mat-datepicker (opened)="changeCalendarLang(primaryLangCode)" [disabled]="!isEditable && id" #picker></mat-datepicker>
                     </mat-form-field>
 
                     <div *ngIf="field.showInSingleView === 'true' && field.inputType === 'dropdown' && field.name === 'locationCode'">
@@ -626,7 +626,7 @@
                         [for]="picker1"
                         [disabled]="!isEditable && id"
                       ></mat-datepicker-toggle>
-                      <mat-datepicker #picker1></mat-datepicker>
+                      <mat-datepicker (opened)="changeCalendarLang(secondaryLang)" #picker1></mat-datepicker>
                     </mat-form-field>
 
                     <div *ngIf="field.showInSingleView === 'true' && field.inputType === 'dropdown' && field.name === 'locationCode'">
diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
index 63a7041f..8ad7f2b3 100644
--- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
+++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
@@ -113,7 +113,6 @@ export class MaterDataCommonBodyComponent implements OnInit {
     this.url = this.router.url.split('/')[3];
     this.fieldsCount = 0;
     this.primaryLangCode = this.headerService.getUserPreferredLanguage();
-    this.dateAdapter.setLocale(defaultJson.keyboardMapping[this.primaryLangCode]);
     if(this.primaryLang === "ara"){
       this.isPrimaryLangRTL = true;
     }
@@ -299,6 +298,10 @@ export class MaterDataCommonBodyComponent implements OnInit {
     
   }
 
+  changeCalendarLang(lang:string){
+    this.dateAdapter.setLocale(defaultJson.keyboardMapping[lang]);
+  }
+
   @HostListener('document:keydown.escape', ['$event']) onKeydownHandler(event: KeyboardEvent) {
     if (this.keyboardService.isOpened) {
       this.keyboardService.dismiss();