diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index 43f4b5dcc9..46bf41398c 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -41,7 +41,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityAdd:
         case PacketType::EntityEdit:
         case PacketType::EntityData:
-            return VERSION_ENTITITES_HAVE_QUERY_BOX;
+            return VERSION_ENTITITES_HAVE_COLLISION_MASK;
         case PacketType::AvatarData:
         case PacketType::BulkAvatarData:
             return static_cast<PacketVersion>(AvatarMixerPacketVersion::SoftAttachmentSupport);
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index d603fde159..cecc5c96b1 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -623,6 +623,9 @@ void EntityMotionState::computeCollisionGroupAndMask(int16_t& group, int16_t& ma
             case MOTION_TYPE_KINEMATIC:
                 group = BULLET_COLLISION_GROUP_KINEMATIC;
                 break;
+            case MOTION_TYPE_DYNAMIC:
+                group = BULLET_COLLISION_GROUP_DYNAMIC;
+                break;
             default:
                 break;
         }