diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index e578e4858d..bc99522d0f 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -993,19 +993,15 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
     }
 
     {
-        // the current frame is set on the server in update() in ModelEntityItem.cpp     
-        int animationCurrentFrame = (int)(glm::floor(entity->getAnimationCurrentFrame()));
-        
-        // in the case where the last frame is greater than the framecount then clamp
-        // it to the end of the animation until it loops around. 
-        if (animationCurrentFrame < 0 || animationCurrentFrame > frameCount) {
-            animationCurrentFrame = 0;
+        float currentFrame = fmod(entity->getAnimationCurrentFrame(), (float)(frameCount));
+        if (currentFrame < 0.0f) {
+            currentFrame += (float)frameCount;
         }
-
-        if (animationCurrentFrame == _lastKnownCurrentFrame) {
+        int currentIntegerFrame = (int)(glm::floor(currentFrame));
+        if (currentIntegerFrame == _lastKnownCurrentFrame) {
             return;
         }
-        _lastKnownCurrentFrame = animationCurrentFrame;
+        _lastKnownCurrentFrame = currentIntegerFrame;
     }
 
     if (_jointMapping.size() != _model->getJointStateCount()) {
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 323584c7ee..3a79df34c6 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -245,7 +245,7 @@ void ModelEntityItem::updateFrameCount() {
     if (_currentFrame < 0.0f) {
         return;
     }
-    
+
     if (!_lastAnimated) {
         _lastAnimated = usecTimestampNow();
         return;
@@ -263,7 +263,7 @@ void ModelEntityItem::updateFrameCount() {
     }
 
     int updatedFrameCount = getAnimationLastFrame() - getAnimationFirstFrame() + 1;
-    
+
     if (!getAnimationHold() && getAnimationIsPlaying()) {
         float deltaTime = (float)interval / (float)USECS_PER_SECOND;
         _currentFrame += (deltaTime * getAnimationFPS());
@@ -283,8 +283,6 @@ void ModelEntityItem::updateFrameCount() {
         // qCDebug(entities)  << "in update frame " << _currentFrame;
         setAnimationCurrentFrame(_currentFrame);
     }
-
-    
 }
 
 void ModelEntityItem::debugDump() const {