diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp
index d9ac522dc8..2ebe769bec 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -212,22 +212,36 @@ void AvatarBookmarks::loadBookmark(const QString& bookmarkName) {
             auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
             auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
             EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;
-            myAvatar->clearWornAvatarEntities();
+
+            // Once the skeleton URL has been loaded, add the Avatar Entities.
+            // We have to wait, because otherwise the avatar entities will try to get attached to the joints
+            // of the *current* avatar at first. But the current avatar might have a different joints scheme
+            // from the new avatar, and that would cause the entities to be attached to the wrong joints.
+
+            std::shared_ptr<QMetaObject::Connection> connection1 = std::make_shared<QMetaObject::Connection>();
+            *connection1 = connect(myAvatar.get(), &MyAvatar::onLoadComplete, [this, bookmark, bookmarkName, myAvatar, connection1]() {
+                qCDebug(interfaceapp) << "Finish loading avatar bookmark" << bookmarkName;
+                QObject::disconnect(*connection1);
+                myAvatar->clearWornAvatarEntities();
+                const float& qScale = bookmark.value(ENTRY_AVATAR_SCALE, 1.0f).toFloat();
+                myAvatar->setAvatarScale(qScale);
+                QList<QVariant> attachments = bookmark.value(ENTRY_AVATAR_ATTACHMENTS, QList<QVariant>()).toList();
+                myAvatar->setAttachmentsVariant(attachments);
+                QVariantList avatarEntities = bookmark.value(ENTRY_AVATAR_ENTITIES, QVariantList()).toList();
+                addAvatarEntities(avatarEntities);
+                emit bookmarkLoaded(bookmarkName);
+            });
+
+            std::shared_ptr<QMetaObject::Connection> connection2 = std::make_shared<QMetaObject::Connection>();
+            *connection2 = connect(myAvatar.get(), &MyAvatar::onLoadFailed, [this, bookmarkName, connection2]() {
+                qCDebug(interfaceapp) << "Failed to load avatar bookmark" << bookmarkName;
+                QObject::disconnect(*connection2);
+            });
+
+            qCDebug(interfaceapp) << "Start loading avatar bookmark" << bookmarkName;
+
             const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString();
             myAvatar->useFullAvatarURL(avatarUrl);
-            qCDebug(interfaceapp) << "Avatar On";
-            const QList<QVariant>& attachments = bookmark.value(ENTRY_AVATAR_ATTACHMENTS, QList<QVariant>()).toList();
-
-            qCDebug(interfaceapp) << "Attach " << attachments;
-            myAvatar->setAttachmentsVariant(attachments);
-
-            const float& qScale = bookmark.value(ENTRY_AVATAR_SCALE, 1.0f).toFloat();
-            myAvatar->setAvatarScale(qScale);
-
-            const QVariantList& avatarEntities = bookmark.value(ENTRY_AVATAR_ENTITIES, QVariantList()).toList();
-            addAvatarEntities(avatarEntities);
-
-            emit bookmarkLoaded(bookmarkName);
         }
     }
 }