diff --git a/src/utils/onRegisterDevice.tsx b/src/utils/onRegisterDevice.tsx
index 933a415de..266ad326c 100644
--- a/src/utils/onRegisterDevice.tsx
+++ b/src/utils/onRegisterDevice.tsx
@@ -5,7 +5,7 @@
  * @format
  */
 import {Store} from '../reducers/index';
-import {FlipperPlugin, FlipperDevicePlugin} from '../plugin';
+import {FlipperPlugin, FlipperDevicePlugin, FlipperBasePlugin} from '../plugin';
 import {setPluginState} from '../reducers/pluginStates';
 import BaseDevice from '../devices/BaseDevice';
 import {getPersistedState} from '../utils/pluginUtils';
@@ -16,7 +16,7 @@ export function registerDeviceCallbackOnPlugins(
   clientPlugins: Map<string, typeof FlipperPlugin>,
   device: BaseDevice,
 ) {
-  const callRegisterDeviceHook = plugin => {
+  const callRegisterDeviceHook = (plugin: typeof FlipperBasePlugin) => {
     if (plugin.onRegisterDevice) {
       plugin.onRegisterDevice(
         store,
diff --git a/src/utils/pluginUtils.tsx b/src/utils/pluginUtils.tsx
index 2f00c32eb..cf63f8a5e 100644
--- a/src/utils/pluginUtils.tsx
+++ b/src/utils/pluginUtils.tsx
@@ -4,7 +4,7 @@
  * LICENSE file in the root directory of this source tree.
  * @format
  */
-import {FlipperDevicePlugin, FlipperPlugin} from '../plugin';
+import {FlipperDevicePlugin, FlipperPlugin, FlipperBasePlugin} from '../plugin';
 import BaseDevice from '../devices/BaseDevice';
 import {State as PluginStatesState} from '../reducers/pluginStates';
 import {pluginsClassMap} from './exportData';
@@ -28,7 +28,7 @@ export function getPluginKey(
 
 export function getPersistedState<PersistedState>(
   pluginKey: string,
-  persistingPlugin: typeof FlipperPlugin | typeof FlipperDevicePlugin | null,
+  persistingPlugin: typeof FlipperBasePlugin | null,
   pluginStates: PluginStatesState,
 ): PersistedState | null {
   if (!persistingPlugin) {