diff --git a/interface/src/scripting/Audio.h b/interface/src/scripting/Audio.h
index ab4fe89ce9..74d85f0107 100644
--- a/interface/src/scripting/Audio.h
+++ b/interface/src/scripting/Audio.h
@@ -19,7 +19,7 @@
 #include "SettingHandle.h"
 #include "AudioFileWav.h"
 #include <shared/ReadWriteLockable.h>
-#include "HifiAudioDeviceInfo.h"
+#include <HifiAudioDeviceInfo.h>
 
 using MutedGetter = std::function<bool()>;
 using MutedSetter = std::function<void(bool)>;
diff --git a/interface/src/scripting/AudioDevices.h b/interface/src/scripting/AudioDevices.h
index 21cd875f7b..13d97d53dd 100644
--- a/interface/src/scripting/AudioDevices.h
+++ b/interface/src/scripting/AudioDevices.h
@@ -19,7 +19,7 @@
 #include <QAbstractListModel>
 #include <QAudioDeviceInfo>
 
-#include "HifiAudioDeviceInfo.h"
+#include <HifiAudioDeviceInfo.h>
 
 namespace scripting {
 
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index b25f1ff3d5..808d264304 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -634,7 +634,7 @@ HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
         for (auto inputDevice : inputDevices) {
             if (((headsetOn || !aecEnabled) && inputDevice.deviceName() == VOICE_RECOGNITION) ||
                 ((!headsetOn && aecEnabled) && inputDevice.deviceName() == VOICE_COMMUNICATION)) {
-                return inputDevice;
+                return HifiAudioDeviceInfo(inputDevice,false,QAudio::AudioInput);
             }
         }
     }
@@ -2025,11 +2025,11 @@ void AudioClient::checkInputTimeout() {
 
 void AudioClient::setHeadsetPluggedIn(bool pluggedIn) {
 #if defined(Q_OS_ANDROID)
-    if (pluggedIn == !_isHeadsetPluggedIn && !_inputDeviceInfo.isNull()) {
+    if (pluggedIn == !_isHeadsetPluggedIn && !_inputDeviceInfo.getDevice().isNull()) {
         QAndroidJniObject brand = QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "BRAND");
         // some samsung phones needs more time to shutdown the previous input device
         if (brand.toString().contains("samsung", Qt::CaseInsensitive)) {
-            switchInputToAudioDevice(QAudioDeviceInfo(), true);
+            switchInputToAudioDevice(HifiAudioDeviceInfo(), true);
             QThread::msleep(200);
         }
 
diff --git a/libraries/audio-client/src/HifiAudioDeviceInfo.h b/libraries/audio-client/src/HifiAudioDeviceInfo.h
index afce47690c..030bee8cfa 100644
--- a/libraries/audio-client/src/HifiAudioDeviceInfo.h
+++ b/libraries/audio-client/src/HifiAudioDeviceInfo.h
@@ -33,10 +33,9 @@ public:
     }
 
     HifiAudioDeviceInfo(QAudioDeviceInfo deviceInfo, bool isDefault, QAudio::Mode mode) :
+        _audioDeviceInfo(deviceInfo),
         _isDefault(isDefault),
-        _mode(mode),
-        _audioDeviceInfo(deviceInfo){
-        
+        _mode(mode){
         setDeviceName(deviceInfo.deviceName());
     }