diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index 711af2ae2d..da8827d89d 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -113,18 +113,18 @@
 <context>
     <name>Menu</name>
     <message>
-        <location filename="src/Menu.cpp" line="457"/>
+        <location filename="src/Menu.cpp" line="459"/>
         <source>Open .ini config file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Menu.cpp" line="459"/>
-        <location filename="src/Menu.cpp" line="471"/>
+        <location filename="src/Menu.cpp" line="461"/>
+        <location filename="src/Menu.cpp" line="473"/>
         <source>Text files (*.ini)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Menu.cpp" line="469"/>
+        <location filename="src/Menu.cpp" line="471"/>
         <source>Save .ini config file</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 30be26ee96..e0da1c0318 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -62,7 +62,8 @@ Menu* Menu::getInstance() {
 const ViewFrustumOffset DEFAULT_FRUSTUM_OFFSET = {-135.0f, 0.0f, 0.0f, 25.0f, 0.0f};
 const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f;
 const float DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER = 1.0f;
-const int FIVE_SECONDS_OF_FRAMES = 5 * 60;
+const int ONE_SECOND_OF_FRAMES = 60;
+const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;
 
 Menu::Menu() :
     _actionHash(),
@@ -82,6 +83,7 @@ Menu::Menu() :
     _lastAdjust(usecTimestampNow()),
     _lastAvatarDetailDrop(usecTimestampNow()),
     _fpsAverage(FIVE_SECONDS_OF_FRAMES),
+    _fastFPSAverage(ONE_SECOND_OF_FRAMES),
     _loginAction(NULL)
 {
     Application *appInstance = Application::getInstance();
@@ -1192,17 +1194,19 @@ void Menu::autoAdjustLOD(float currentFPS) {
         currentFPS = ASSUMED_FPS;
     }
     _fpsAverage.updateAverage(currentFPS);
+    _fastFPSAverage.updateAverage(currentFPS);
 
     quint64 now = usecTimestampNow();
     
-    if (_fpsAverage.getAverage() < ADJUST_LOD_DOWN_FPS) {
-        if (now - _lastAvatarDetailDrop > ADJUST_LOD_DOWN_DELAY) {
+    const quint64 ADJUST_AVATAR_LOD_DOWN_DELAY = 1000 * 1000;
+    if (_fastFPSAverage.getAverage() < ADJUST_LOD_DOWN_FPS) {
+        if (now - _lastAvatarDetailDrop > ADJUST_AVATAR_LOD_DOWN_DELAY) {
             // attempt to lower the detail in proportion to the fps difference
             float targetFps = (ADJUST_LOD_DOWN_FPS + ADJUST_LOD_UP_FPS) * 0.5f;
-            _avatarLODDistanceMultiplier *= (targetFps / _fpsAverage.getAverage()); 
+            _avatarLODDistanceMultiplier *= (targetFps / _fastFPSAverage.getAverage()); 
             _lastAvatarDetailDrop = now;
         }
-    } else if (_fpsAverage.getAverage() > ADJUST_LOD_UP_FPS) {
+    } else if (_fastFPSAverage.getAverage() > ADJUST_LOD_UP_FPS) {
         // let the detail level creep slowly upwards
         const float DISTANCE_DECREASE_RATE = 0.01f;
         const float MINIMUM_DISTANCE_MULTIPLIER = 0.1f;
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 9452ba220d..23ddb8d3dc 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -211,6 +211,7 @@ private:
     quint64 _lastAdjust;
     quint64 _lastAvatarDetailDrop;
     SimpleMovingAverage _fpsAverage;
+    SimpleMovingAverage _fastFPSAverage;
     QAction* _loginAction;
     QAction* _chatAction;
 };