diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index ddd032e91e..b3b8ba3ab1 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -135,9 +135,9 @@ QByteArray AvatarData::toByteArray() {
     // lazily allocate memory for HeadData in case we're not an Avatar instance
     if (!_headData) {
         _headData = new HeadData(this);
-        if (_forceFaceshiftConnected) {
-            _headData->_isFaceshiftConnected = true;
-        }
+    }
+    if (_forceFaceshiftConnected) {
+        _headData->_isFaceshiftConnected = true;
     }
     
     QByteArray avatarDataByteArray;
diff --git a/libraries/avatars/src/Recorder.cpp b/libraries/avatars/src/Recorder.cpp
index 2c35790b2e..5e9db60675 100644
--- a/libraries/avatars/src/Recorder.cpp
+++ b/libraries/avatars/src/Recorder.cpp
@@ -229,6 +229,9 @@ void Player::startPlaying() {
         _audioThread->start();
         QMetaObject::invokeMethod(_injector.data(), "injectAudio", Qt::QueuedConnection);
         
+        // Fake faceshift connection
+        _avatar->setForceFaceshiftConnected(true);
+        
         _timer.start();
     }
 }
@@ -253,6 +256,9 @@ void Player::stopPlaying() {
     _injector.clear();
     _audioThread = NULL;
     
+    // Turn off fake faceshift connection
+    _avatar->setForceFaceshiftConnected(false);
+    
     qDebug() << "Recorder::stopPlaying()";
 }