diff --git a/libraries/animation/src/Flow.cpp b/libraries/animation/src/Flow.cpp
index a77336b509..56194ea011 100644
--- a/libraries/animation/src/Flow.cpp
+++ b/libraries/animation/src/Flow.cpp
@@ -445,6 +445,7 @@ void FlowThread::setScale(float scale, bool initScale) {
 }
 
 FlowThread& FlowThread::operator=(const FlowThread& otherFlowThread) {
+    _rigScale = otherFlowThread._rigScale;
     for (int jointIndex: otherFlowThread._joints) {
         auto& joint = otherFlowThread._jointsPointer->at(jointIndex);
         auto& myJoint = _jointsPointer->at(jointIndex);
@@ -798,6 +799,7 @@ Flow& Flow::operator=(const Flow& otherFlow) {
     _active = otherFlow.getActive();
     _scale = otherFlow.getScale();
     _isScaleSet = true;
+    _rig = otherFlow._rig;
     auto &threads = otherFlow.getThreads();
     if (threads.size() == _jointThreads.size()) {
         for (size_t i = 0; i < _jointThreads.size(); i++) {
diff --git a/libraries/animation/src/Flow.h b/libraries/animation/src/Flow.h
index 363db33736..6235b97757 100644
--- a/libraries/animation/src/Flow.h
+++ b/libraries/animation/src/Flow.h
@@ -278,6 +278,7 @@ public:
     std::vector<glm::vec3> _positions;
     float _radius{ 0.0f };
     float _length{ 0.0f };
+    // 100.0f was default rig scale when it was hardcoded but it caused issues with most avatars
     float _rigScale { 100.0f };
     std::map<int, FlowJoint>* _jointsPointer;
     std::vector<glm::vec3> _rootFramePositions;
@@ -324,8 +325,6 @@ private:
     
     float _scale { 1.0f };
     float _lastScale{ 1.0f };
-    // 100.0f was default rig scale when it was hardcoded but it caused issues with most avatars
-    //float _rigScale{ 100.0f };
     // Rig to which flow system belongs, it's used for getting rig scale
     Rig *_rig { nullptr };
     glm::vec3 _entityPosition;