diff --git a/apps/common-app/src/examples/Record/Record.tsx b/apps/common-app/src/examples/Record/Record.tsx
index 1765b203f..a2addeb79 100644
--- a/apps/common-app/src/examples/Record/Record.tsx
+++ b/apps/common-app/src/examples/Record/Record.tsx
@@ -199,8 +199,8 @@ const Record: FC = () => {
   };
 
   const onSelect = useCallback(
-    (uid: string) => {
-      const input = availableInputs.find((d) => d.uid === uid);
+    (id: string) => {
+      const input = availableInputs.find((d) => d.id === id);
 
       if (input) {
         onSelectInput(input);
@@ -224,9 +224,9 @@ const Record: FC = () => {
       </View>
       <View>
         <Select
-          value={currentInput?.uid || ''}
+          value={currentInput?.id || ''}
           onChange={onSelect}
-          options={availableInputs.map((d) => d.uid) || []}
+          options={availableInputs.map((d) => d.id) || []}
         />
       </View>
       <View style={{ alignItems: 'center', gap: 10 }}>
diff --git a/packages/audiodocs/docs/react/select-input.mdx b/packages/audiodocs/docs/react/select-input.mdx
index 6c8630225..7e09c3560 100644
--- a/packages/audiodocs/docs/react/select-input.mdx
+++ b/packages/audiodocs/docs/react/select-input.mdx
@@ -33,7 +33,7 @@ function AudioInputSelector() {
 
       {availableInputs.map((input) => (
         <Button
-          key={input.uid}
+          key={input.id}
           title={`${input.name} (${input.category})`}
           onPress={() => onSelectInput(input)}
         />
@@ -50,7 +50,7 @@ The hook returns an object with the following properties:
 ### `availableInputs: AudioDeviceInfo[]`
 
 An array of all available audio input devices. Each device contains:
-- `uid: string` - Unique device identifier
+- `id: string` - Unique device identifier
 - `name: string` - Human-readable device name
 - `category: string` - Device category (e.g., "Built-In Microphone", "Bluetooth")
 
diff --git a/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt b/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt
index c5fc70df6..9a62b7e72 100644
--- a/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt
+++ b/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt
@@ -173,7 +173,7 @@ class AudioAPIModule(
   ) {
     // TODO: noop for now, but it should be moved to upcoming
     // audio engine implementation for android (duplex stream)
-    Promise.resolve(true)
+    promise?.resolve(true)
   }
 
   // Notification system methods
diff --git a/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/MediaSessionManager.kt b/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/MediaSessionManager.kt
index 75ec58f30..b1f176e42 100644
--- a/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/MediaSessionManager.kt
+++ b/packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/MediaSessionManager.kt
@@ -209,6 +209,7 @@ object MediaSessionManager {
 
     for (inputDevice in this.audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
       val deviceInfo = Arguments.createMap()
+      deviceInfo.putString("id", inputDevice.getId().toString())
       deviceInfo.putString("name", inputDevice.productName.toString())
       deviceInfo.putString("type", parseDeviceType(inputDevice))
 
@@ -217,6 +218,7 @@ object MediaSessionManager {
 
     for (outputDevice in this.audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
       val deviceInfo = Arguments.createMap()
+      deviceInfo.putString("id", outputDevice.getId().toString())
       deviceInfo.putString("name", outputDevice.productName.toString())
       deviceInfo.putString("type", parseDeviceType(outputDevice))
 
diff --git a/packages/react-native-audio-api/ios/audioapi/ios/system/AudioSessionManager.mm b/packages/react-native-audio-api/ios/audioapi/ios/system/AudioSessionManager.mm
index 63e3319ef..cb9cca613 100644
--- a/packages/react-native-audio-api/ios/audioapi/ios/system/AudioSessionManager.mm
+++ b/packages/react-native-audio-api/ios/audioapi/ios/system/AudioSessionManager.mm
@@ -298,7 +298,7 @@ - (void)getDevicesInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectB
     [deviceList addObject:@{
       @"name" : device.portName,
       @"category" : device.portType,
-      @"uid" : device.UID,
+      @"id" : device.UID,
     }];
   }
 
diff --git a/packages/react-native-audio-api/src/hooks/useAudioInput.ts b/packages/react-native-audio-api/src/hooks/useAudioInput.ts
index 6f3df8d40..df475e012 100644
--- a/packages/react-native-audio-api/src/hooks/useAudioInput.ts
+++ b/packages/react-native-audio-api/src/hooks/useAudioInput.ts
@@ -30,10 +30,10 @@ export default function useAudioInput() {
   const [currentInput, setCurrentInput] = useState<string | null>(null);
 
   const onSelectInput = useCallback(async (device: AudioDeviceInfo) => {
-    const success = await AudioManager.setInputDevice(device.uid);
+    const success = await AudioManager.setInputDevice(device.id);
 
     if (success) {
-      setCurrentInput(device.uid);
+      setCurrentInput(device.id);
     }
 
     const devicesInfo: AudioDevicesInfo = await AudioManager.getDevicesInfo();
@@ -43,12 +43,12 @@ export default function useAudioInput() {
   useEffect(() => {
     async function fetchAvailableInputs() {
       const audioDevices = await AudioManager.getDevicesInfo();
-      const currentDeviceUid = audioDevices.currentInputs.length
-        ? audioDevices.currentInputs[0].uid
+      const currentDeviceId = audioDevices.currentInputs.length
+        ? audioDevices.currentInputs[0].id
         : null;
 
       setAvailableInputs(audioDevices.availableInputs);
-      setCurrentInput(currentDeviceUid);
+      setCurrentInput(currentDeviceId);
     }
 
     async function handleRouteChange(event: OnRouteChangeEventType) {
@@ -81,7 +81,7 @@ export default function useAudioInput() {
        * The currently selected audio input device, or null if none is yet
        * decided by the system.
        */
-      currentInput: availableInputs.find((d) => d.uid === currentInput) || null,
+      currentInput: availableInputs.find((d) => d.id === currentInput) || null,
       /**
        * Selects the given device as the current input. Returns true if
        * successful, throws otherwise.
diff --git a/packages/react-native-audio-api/src/system/types.ts b/packages/react-native-audio-api/src/system/types.ts
index eb940484e..73d3b31e9 100644
--- a/packages/react-native-audio-api/src/system/types.ts
+++ b/packages/react-native-audio-api/src/system/types.ts
@@ -54,7 +54,7 @@ export interface SessionOptions {
 export type PermissionStatus = 'Undetermined' | 'Denied' | 'Granted';
 
 export interface AudioDeviceInfo {
-  uid: string;
+  id: string;
   name: string;
   category: string;
 }