diff --git a/src/dispatcher/androidDevice.tsx b/src/dispatcher/androidDevice.tsx
index b4f26a408..6dd28ec1f 100644
--- a/src/dispatcher/androidDevice.tsx
+++ b/src/dispatcher/androidDevice.tsx
@@ -10,7 +10,7 @@ import child_process from 'child_process';
 import {Store} from '../reducers/index';
 import BaseDevice from '../devices/BaseDevice';
 import {Logger} from '../fb-interfaces/Logger.js';
-import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice.js';
+import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice';
 import {getAdbClient} from '../utils/adbClient';
 import {default as which} from 'which';
 import {promisify} from 'util';
diff --git a/src/dispatcher/iOSDevice.tsx b/src/dispatcher/iOSDevice.tsx
index b7e1f9273..e8345be73 100644
--- a/src/dispatcher/iOSDevice.tsx
+++ b/src/dispatcher/iOSDevice.tsx
@@ -17,7 +17,7 @@ import iosUtil from '../fb-stubs/iOSContainerUtility';
 import IOSDevice from '../devices/IOSDevice';
 import isProduction from '../utils/isProduction';
 import GK from '../fb-stubs/GK';
-import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice.js';
+import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice';
 type iOSSimulatorDevice = {
   state: 'Booted' | 'Shutdown' | 'Shutting Down';
   availability?: string;
diff --git a/src/utils/onRegisterDevice.js b/src/utils/onRegisterDevice.tsx
similarity index 70%
rename from src/utils/onRegisterDevice.js
rename to src/utils/onRegisterDevice.tsx
index 1108bd49d..933a415de 100644
--- a/src/utils/onRegisterDevice.js
+++ b/src/utils/onRegisterDevice.tsx
@@ -4,16 +4,16 @@
  * LICENSE file in the root directory of this source tree.
  * @format
  */
-import type {Store} from '../reducers/index.tsx';
-import {FlipperPlugin, FlipperDevicePlugin} from '../plugin.tsx';
-import {setPluginState} from '../reducers/pluginStates.tsx';
-import type BaseDevice from '../devices/BaseDevice.tsx';
-import {getPersistedState} from '../utils/pluginUtils.tsx';
+import {Store} from '../reducers/index';
+import {FlipperPlugin, FlipperDevicePlugin} from '../plugin';
+import {setPluginState} from '../reducers/pluginStates';
+import BaseDevice from '../devices/BaseDevice';
+import {getPersistedState} from '../utils/pluginUtils';
 
 export function registerDeviceCallbackOnPlugins(
   store: Store,
-  devicePlugins: Map<string, Class<FlipperDevicePlugin<>>>,
-  clientPlugins: Map<string, Class<FlipperPlugin<>>>,
+  devicePlugins: Map<string, typeof FlipperDevicePlugin>,
+  clientPlugins: Map<string, typeof FlipperPlugin>,
   device: BaseDevice,
 ) {
   const callRegisterDeviceHook = plugin => {