diff --git a/src/ipc/channels.ts b/src/ipc/channels.ts
index 86035a7dc..0f3e4798b 100644
--- a/src/ipc/channels.ts
+++ b/src/ipc/channels.ts
@@ -1,9 +1,9 @@
 import type { AnyAction } from 'redux';
 
 import type { Download } from '../downloads/common';
+import type { OutlookEventsResponse } from '../outlookCalendar/type';
 import type { Server } from '../servers/common';
 import type { SystemIdleState } from '../userPresence/common';
-import { OutlookEventsResponse } from '../outlookCalendar/type';
 
 type ChannelToArgsMap = {
   'redux/get-initial-state': () => unknown;
diff --git a/src/outlookCalendar/actions.ts b/src/outlookCalendar/actions.ts
index 30a37323c..3d92db8db 100644
--- a/src/outlookCalendar/actions.ts
+++ b/src/outlookCalendar/actions.ts
@@ -1,5 +1,5 @@
-import { Server } from '../servers/common';
-import { OutlookCredentials } from './type';
+import type { Server } from '../servers/common';
+import type { OutlookCredentials } from './type';
 
 export const OUTLOOK_CALENDAR_SET_CREDENTIALS =
   'outlook-calendar/set-credentials';
diff --git a/src/outlookCalendar/getOutlookEvents.ts b/src/outlookCalendar/getOutlookEvents.ts
index ba0d8c143..7378767db 100644
--- a/src/outlookCalendar/getOutlookEvents.ts
+++ b/src/outlookCalendar/getOutlookEvents.ts
@@ -1,11 +1,11 @@
 /* eslint-disable new-cap */
 import { XhrApi } from '@ewsjs/xhr';
+import type { Appointment } from 'ews-javascript-api';
 import {
   FolderId,
   CalendarView,
   DateTime,
   WellKnownFolderName,
-  Appointment,
   BasePropertySet,
   PropertySet,
   ConfigurationApi,
diff --git a/src/outlookCalendar/ipc.ts b/src/outlookCalendar/ipc.ts
index f23d87f29..922548620 100644
--- a/src/outlookCalendar/ipc.ts
+++ b/src/outlookCalendar/ipc.ts
@@ -3,7 +3,7 @@ import { safeStorage } from 'electron';
 
 import { selectPersistableValues } from '../app/selectors';
 import { handle } from '../ipc/main';
-import { Server } from '../servers/common';
+import type { Server } from '../servers/common';
 import { dispatch, request, select } from '../store';
 import {
   OUTLOOK_CALENDAR_SET_CREDENTIALS,
diff --git a/src/outlookCalendar/preload.ts b/src/outlookCalendar/preload.ts
index cec1cdd4b..1e900308f 100644
--- a/src/outlookCalendar/preload.ts
+++ b/src/outlookCalendar/preload.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron';
 
-import { OutlookEventsResponse } from './type';
+import type { OutlookEventsResponse } from './type';
 
 export const getOutlookEvents = async (
   date: Date
diff --git a/src/servers/common.ts b/src/servers/common.ts
index 527f589a0..4eed19241 100644
--- a/src/servers/common.ts
+++ b/src/servers/common.ts
@@ -1,4 +1,4 @@
-import { OutlookCredentials } from '../outlookCalendar/type';
+import type { OutlookCredentials } from '../outlookCalendar/type';
 
 export type Server = {
   url: string;
diff --git a/src/servers/reducers.ts b/src/servers/reducers.ts
index 2e3dce07c..1a8ffe83d 100644
--- a/src/servers/reducers.ts
+++ b/src/servers/reducers.ts
@@ -2,8 +2,8 @@ import type { Reducer } from 'redux';
 
 import { APP_SETTINGS_LOADED } from '../app/actions';
 import { DEEP_LINKS_SERVER_ADDED } from '../deepLinks/actions';
-import type { ActionOf } from '../store/actions';
 import { OUTLOOK_CALENDAR_SAVE_CREDENTIALS } from '../outlookCalendar/actions';
+import type { ActionOf } from '../store/actions';
 import {
   ADD_SERVER_VIEW_SERVER_ADDED,
   SIDE_BAR_REMOVE_SERVER_CLICKED,
diff --git a/src/store/actions.ts b/src/store/actions.ts
index fe7c7260c..d30599925 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -5,13 +5,13 @@ import type { I18nActionTypeToPayloadMap } from '../i18n/actions';
 import type { JitsiServerActionTypeToPayloadMap } from '../jitsi/actions';
 import type { NavigationActionTypeToPayloadMap } from '../navigation/actions';
 import type { NotificationsActionTypeToPayloadMap } from '../notifications/actions';
+import type { OutlookCalendarActionTypeToPayloadMap } from '../outlookCalendar/actions';
 import type { ScreenSharingActionTypeToPayloadMap } from '../screenSharing/actions';
 import type { ServersActionTypeToPayloadMap } from '../servers/actions';
 import type { SpellCheckingActionTypeToPayloadMap } from '../spellChecking/actions';
 import type { UiActionTypeToPayloadMap } from '../ui/actions';
 import type { UpdatesActionTypeToPayloadMap } from '../updates/actions';
 import type { UserPresenceActionTypeToPayloadMap } from '../userPresence/actions';
-import type { OutlookCalendarActionTypeToPayloadMap } from '../outlookCalendar/actions';
 
 type ActionTypeToPayloadMap = AppActionTypeToPayloadMap &
   DeepLinksActionTypeToPayloadMap &
diff --git a/src/ui/components/OutlookCredentialsDialog/index.tsx b/src/ui/components/OutlookCredentialsDialog/index.tsx
index 202eadd7a..3f6f546ee 100644
--- a/src/ui/components/OutlookCredentialsDialog/index.tsx
+++ b/src/ui/components/OutlookCredentialsDialog/index.tsx
@@ -11,22 +11,23 @@ import {
   TextInput,
   ButtonGroup,
 } from '@rocket.chat/fuselage';
-import React, { FC, useEffect, useRef, useState, ReactElement } from 'react';
+import type { FC, ReactElement } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useSelector, useDispatch } from 'react-redux';
-import { Dispatch } from 'redux';
+import type { Dispatch } from 'redux';
 
 import {
   OUTLOOK_CALENDAR_ASK_CREDENTIALS,
   OUTLOOK_CALENDAR_DIALOG_DISMISSED,
   OUTLOOK_CALENDAR_SET_CREDENTIALS,
 } from '../../../outlookCalendar/actions';
-import { Server } from '../../../servers/common';
+import type { Server } from '../../../servers/common';
 import { listen } from '../../../store';
-import { RootAction } from '../../../store/actions';
+import type { RootAction } from '../../../store/actions';
 import { isRequest } from '../../../store/fsa';
-import { RootState } from '../../../store/rootReducer';
+import type { RootState } from '../../../store/rootReducer';
 import { Dialog } from '../Dialog';
 
 export type AuthPayload = {