diff --git a/src/ObjWriting/XModel/Export/XModelExportWriter.cpp b/src/ObjWriting/XModel/Export/XModelExportWriter.cpp
index 45f4a021..b8531a6d 100644
--- a/src/ObjWriting/XModel/Export/XModelExportWriter.cpp
+++ b/src/ObjWriting/XModel/Export/XModelExportWriter.cpp
@@ -18,16 +18,16 @@ protected:
         auto vertexOffset = 0u;
         for (const auto& vertex : xmodel.m_vertices)
         {
-            XModelVertexBoneWeights weights{0, 0};
+            XModelVertexBoneWeights weights{.weightOffset = 0, .weightCount = 0};
 
             if (vertexOffset < xmodel.m_vertex_bone_weights.size())
                 weights = xmodel.m_vertex_bone_weights[vertexOffset];
 
-            m_vertex_merger.Add(VertexMergerPos{vertex.coordinates[0],
-                                                vertex.coordinates[1],
-                                                vertex.coordinates[2],
-                                                &xmodel.m_bone_weight_data.weights[weights.weightOffset],
-                                                weights.weightCount});
+            m_vertex_merger.Add(VertexMergerPos{.x = vertex.coordinates[0],
+                                                .y = vertex.coordinates[1],
+                                                .z = vertex.coordinates[2],
+                                                .weights = &xmodel.m_bone_weight_data.weights[weights.weightOffset],
+                                                .weightCount = weights.weightCount});
 
             vertexOffset++;
         }
diff --git a/src/ObjWriting/XModel/XModelDumper.cpp.template b/src/ObjWriting/XModel/XModelDumper.cpp.template
index c1d75920..a79a4ef2 100644
--- a/src/ObjWriting/XModel/XModelDumper.cpp.template
+++ b/src/ObjWriting/XModel/XModelDumper.cpp.template
@@ -532,6 +532,12 @@ namespace
         }
     }
 
+    bool CanOmitDefaultArmature()
+    {
+        return ObjWriting::Configuration.ModelOutputFormat != ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_EXPORT
+               && ObjWriting::Configuration.ModelOutputFormat != ObjWriting::Configuration_t::ModelOutputFormat_e::XMODEL_BIN;
+    }
+
     void PopulateXModelWriter(XModelCommon& out, const AssetDumpingContext& context, const unsigned lod, const XModel* model)
     {
         DistinctMapper<Material*> materialMapper(model->numsurfs);
@@ -542,8 +548,8 @@ namespace
         AddXModelObjects(out, model, lod, materialMapper);
         AddXModelVertices(out, model, lod);
         AddXModelFaces(out, model, lod);
-
-        if (!HasDefaultArmature(model, lod))
+        
+        if (!CanOmitDefaultArmature() || !HasDefaultArmature(model, lod))
         {
             AddXModelBones(out, context, model);
             AddXModelVertexBoneWeights(out, model, lod);