diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 475e7a1abc..e9d804d227 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -228,14 +228,18 @@ void Avatar::render(const glm::vec3& cameraPosition, RenderMode renderMode) {
             _skeletonModel.renderJointCollisionShapes(0.7f);
         }
         if (Menu::getInstance()->isOptionChecked(MenuOption::RenderHeadCollisionShapes)) {
-            getHead()->getFaceModel().updateShapePositions();
-            getHead()->getFaceModel().renderJointCollisionShapes(0.7f);
+            if (shouldRenderHead(cameraPosition, renderMode)) {
+                getHead()->getFaceModel().updateShapePositions();
+                getHead()->getFaceModel().renderJointCollisionShapes(0.7f);
+            }
         }
         if (Menu::getInstance()->isOptionChecked(MenuOption::RenderBoundingCollisionShapes)) {
-            getHead()->getFaceModel().updateShapePositions();
-            getHead()->getFaceModel().renderBoundingCollisionShapes(0.7f);
-            _skeletonModel.updateShapePositions();
-            _skeletonModel.renderBoundingCollisionShapes(0.7f);
+            if (shouldRenderHead(cameraPosition, renderMode)) {
+                getHead()->getFaceModel().updateShapePositions();
+                getHead()->getFaceModel().renderBoundingCollisionShapes(0.7f);
+                _skeletonModel.updateShapePositions();
+                _skeletonModel.renderBoundingCollisionShapes(0.7f);
+            }
         }
 
         // quick check before falling into the code below:
@@ -344,6 +348,10 @@ void Avatar::renderBody(RenderMode renderMode) {
     getHand()->render(false);
 }
 
+bool Avatar::shouldRenderHead(const glm::vec3& cameraPosition, RenderMode renderMode) const {
+    return true;
+}
+
 void Avatar::updateJointMappings() {
     // no-op; joint mappings come from skeleton model
 }
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index ca05e5dbbf..4d68f2168b 100755
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -195,6 +195,7 @@ protected:
 
     void renderDisplayName();
     virtual void renderBody(RenderMode renderMode);
+    virtual bool shouldRenderHead(const glm::vec3& cameraPosition, RenderMode renderMode) const;
 
     virtual void updateJointMappings();
 
diff --git a/interface/src/avatar/Head.h b/interface/src/avatar/Head.h
index a6cda5622c..5f0c6519ef 100644
--- a/interface/src/avatar/Head.h
+++ b/interface/src/avatar/Head.h
@@ -78,7 +78,7 @@ public:
     
     const bool getReturnToCenter() const { return _returnHeadToCenter; } // Do you want head to try to return to center (depends on interface detected)
     float getAverageLoudness() const { return _averageLoudness; }
-    glm::vec3 calculateAverageEyePosition() { return _leftEyePosition + (_rightEyePosition - _leftEyePosition ) * ONE_HALF; }
+    glm::vec3 calculateAverageEyePosition() const { return _leftEyePosition + (_rightEyePosition - _leftEyePosition ) * ONE_HALF; }
     
     /// \return the point about which scaling occurs.
     glm::vec3 getScalePivot() const;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index a258cd341b..fa15117cb2 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -647,15 +647,20 @@ void MyAvatar::renderBody(RenderMode renderMode) {
     _skeletonModel.render(1.0f, modelRenderMode);
 
     //  Render head so long as the camera isn't inside it
-    const float RENDER_HEAD_CUTOFF_DISTANCE = 0.50f;
-    Camera* myCamera = Application::getInstance()->getCamera();
-    if (renderMode != NORMAL_RENDER_MODE || (glm::length(myCamera->getPosition() - getHead()->calculateAverageEyePosition()) >
-            RENDER_HEAD_CUTOFF_DISTANCE * _scale)) {
+    if (shouldRenderHead(Application::getInstance()->getCamera()->getPosition(), renderMode)) {
         getHead()->render(1.0f, modelRenderMode);
     }
     getHand()->render(true);
 }
 
+const float RENDER_HEAD_CUTOFF_DISTANCE = 0.50f;
+
+bool MyAvatar::shouldRenderHead(const glm::vec3& cameraPosition, RenderMode renderMode) const {
+    const Head* head = getHead();
+    return (renderMode != NORMAL_RENDER_MODE) || 
+        (glm::length(cameraPosition - head->calculateAverageEyePosition()) > RENDER_HEAD_CUTOFF_DISTANCE * _scale);
+}
+
 void MyAvatar::updateThrust(float deltaTime) {
     //
     //  Gather thrust information from keyboard and sensors to apply to avatar motion
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 66ab322444..71c74f7c91 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -41,6 +41,7 @@ public:
 
     void render(const glm::vec3& cameraPosition, RenderMode renderMode = NORMAL_RENDER_MODE);
     void renderBody(RenderMode renderMode);
+    bool shouldRenderHead(const glm::vec3& cameraPosition, RenderMode renderMode) const;
     void renderDebugBodyPoints();
     void renderHeadMouse() const;