diff --git a/app/components/StepsOfStepper/IntermediateStep.tsx b/app/components/StepsOfStepper/IntermediateStep.tsx
index 2c947c2..e0b772a 100644
--- a/app/components/StepsOfStepper/IntermediateStep.tsx
+++ b/app/components/StepsOfStepper/IntermediateStep.tsx
@@ -1,20 +1,14 @@
-import React from 'react';
-import { ipcRenderer, remote } from 'electron';
+import React, { useEffect, useState } from 'react';
+import { ipcRenderer } from 'electron';
 import { Button, Text } from '@blueprintjs/core';
 import { useTranslation } from 'react-i18next';
 import { TFunction } from 'i18next';
 import { Col, Row } from 'react-flexbox-grid';
-import DEVICES from '../../constants/test-devices.json';
 import ScanQRStep from './ScanQRStep';
 import ChooseAppOrScreeenStep from './ChooseAppOrScreeenStep';
 import ConfirmStep from './ConfirmStep';
-import ConnectedDevicesService from '../../features/ConnectedDevicesService';
 import { IpcEvents } from '../../main/IpcEvents.enum';
 
-const connectedDevicesService = remote.getGlobal(
-  'connectedDevicesService'
-) as ConnectedDevicesService;
-
 interface IntermediateStepProps {
   activeStep: number;
   steps: string[];
@@ -31,7 +25,7 @@ function getStepContent(
   stepIndex: number,
   handleNextEntireScreen: () => void,
   handleNextApplicationWindow: () => void,
-  pendingConnectionDevice: Device | null
+  device: Device
 ) {
   switch (stepIndex) {
     case 0:
@@ -53,7 +47,7 @@ function getStepContent(
         </>
       );
     case 2:
-      return <ConfirmStep device={pendingConnectionDevice} />;
+      return <ConfirmStep device={device} />;
     default:
       return 'Unknown stepIndex';
   }
@@ -65,6 +59,7 @@ function isConfirmStep(activeStep: number, steps: string[]) {
 
 export default function IntermediateStep(props: IntermediateStepProps) {
   const { t } = useTranslation();
+  const [pendingConnectionDevice, setPendingConnectionDevice] = useState();
 
   const {
     activeStep,
@@ -77,9 +72,16 @@ export default function IntermediateStep(props: IntermediateStepProps) {
     resetUserAllowedConnection,
   } = props;
 
-  const connectDevice = (device: Device) => {
-    connectedDevicesService.setPendingConnectionDevice(device);
-  };
+  useEffect(() => {
+    // eslint-disable-next-line promise/always-return
+    ipcRenderer
+      .invoke(IpcEvents.GetPendingConnectionDevice)
+      // eslint-disable-next-line promise/always-return
+      .then((device) => {
+        setPendingConnectionDevice(device);
+      })
+      .catch((e) => console.error(e));
+  }, []);
 
   return (
     <Col
@@ -93,13 +95,14 @@ export default function IntermediateStep(props: IntermediateStepProps) {
         width: '100%',
       }}
     >
-      {getStepContent(
-        t,
-        activeStep,
-        handleNextEntireScreen,
-        handleNextApplicationWindow,
-        connectedDevicesService.pendingConnectionDevice
-      )}
+      {pendingConnectionDevice &&
+        getStepContent(
+          t,
+          activeStep,
+          handleNextEntireScreen,
+          handleNextApplicationWindow,
+          pendingConnectionDevice
+        )}
 
       {
         // eslint-disable-next-line no-nested-ternary
@@ -111,11 +114,7 @@ export default function IntermediateStep(props: IntermediateStepProps) {
           // eslint-disable-next-line react/jsx-indent
           <Button
             onClick={() => {
-              connectDevice(
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
-                DEVICES[Math.floor(Math.random() * DEVICES.length)]
-              );
+              // connectedDevicesService.setPendingConnectionDevice(DEVICES[Math.floor(Math.random() * DEVICES.length)]);
             }}
           >
             Connect Test Device
diff --git a/app/components/ToggleThemeBtnGroup/index.tsx b/app/components/ToggleThemeBtnGroup/index.tsx
index 6e0c7e5..553c895 100644
--- a/app/components/ToggleThemeBtnGroup/index.tsx
+++ b/app/components/ToggleThemeBtnGroup/index.tsx
@@ -16,7 +16,6 @@ export default function ToggleThemeBtnGroup() {
       document.body.classList.toggle(Classes.DARK);
       setIsDarkThemeHook(true);
     }
-    // TODO: call sharing sessions service here to notify all connected clients about theme change
     sharingSessionService.sharingSessions.forEach((sharingSession) => {
       sharingSession?.appThemeChanged();
     });
@@ -27,7 +26,6 @@ export default function ToggleThemeBtnGroup() {
       document.body.classList.toggle(Classes.DARK);
       setIsDarkThemeHook(false);
     }
-    // TODO: call sharing sessions service here to notify all connected clients about theme change
     sharingSessionService.sharingSessions.forEach((sharingSession) => {
       sharingSession?.appThemeChanged();
     });
diff --git a/app/main/IpcEvents.enum.ts b/app/main/IpcEvents.enum.ts
index 8800c03..d9c6720 100644
--- a/app/main/IpcEvents.enum.ts
+++ b/app/main/IpcEvents.enum.ts
@@ -16,4 +16,5 @@ export enum IpcEvents {
   GetDesktopCapturerServiceSourcesMap = 'get-desktop-capturer-service-sources-map',
   GetWaitingForConnectionSharingSessionSourceId = 'get-waiting-for-connection-sharing-session-source-id',
   StartSharingOnWaitingForConnectionSharingSession = 'start-sharing-on-waiting-for-connection-sharing-session',
+  GetPendingConnectionDevice = 'get-pending-connection-device',
 }
diff --git a/app/main/ipcMainHandlers.ts b/app/main/ipcMainHandlers.ts
index cab09e4..12d047b 100644
--- a/app/main/ipcMainHandlers.ts
+++ b/app/main/ipcMainHandlers.ts
@@ -231,4 +231,8 @@ export default function initIpcMainHandlers(
       getDeskreenGlobal().connectedDevicesService.resetPendingConnectionDevice();
     }
   );
+
+  ipcMain.handle(IpcEvents.GetPendingConnectionDevice, () => {
+    return getDeskreenGlobal().connectedDevicesService.pendingConnectionDevice;
+  });
 }