diff --git a/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml b/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
index 04e3934535..6d371741ea 100644
--- a/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
+++ b/interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
@@ -24,6 +24,7 @@ Item {
     Rectangle { color: hifi.colors.baseGray; anchors.fill: parent; radius: 4 }
 
     Component.onCompleted: {
+        jointChooser.model = MyAvatar.jointNames;
         completed = true;
     }
 
@@ -82,7 +83,6 @@ Item {
             HifiControls.ComboBox {
                 id: jointChooser;
                 anchors { bottom: parent.bottom; left: parent.left; right: parent.right }
-                model: MyAvatar.jointNames
                 colorScheme: hifi.colorSchemes.dark
                 currentIndex: attachment ? model.indexOf(attachment.jointName) : -1
                 onCurrentIndexChanged: {
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index dee0d1cb20..d0c7b3912c 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1638,7 +1638,9 @@ void AvatarData::setAttachmentsVariant(const QVariantList& variant) {
     for (const auto& attachmentVar : variant) {
         AttachmentData attachment;
         attachment.fromVariant(attachmentVar);
-        newAttachments.append(attachment);
+        if (!attachment.modelURL.isEmpty()) {
+            newAttachments.append(attachment);
+        }
     }
     setAttachmentData(newAttachments);
 }