diff --git a/P3D/Entites/Entity.vb b/P3D/Entites/Entity.vb
index 56aa5d8f6..e60f23c2b 100644
--- a/P3D/Entites/Entity.vb
+++ b/P3D/Entites/Entity.vb
@@ -615,21 +615,29 @@
     Public ReadOnly Property VertexCount() As Integer
         Get
             If Me._cachedVertexCount = -1 Then
-                If Not Me.BaseModel Is Nothing Then
-                    Dim c As Integer = CInt(Me.BaseModel.vertexBuffer.VertexCount / 3)
-                    Dim min As Integer = 0
-
-                    For i = 0 To Me.TextureIndex.Length - 1
-                        If i <= c - 1 Then
-                            If TextureIndex(i) > -1 Then
-                                min += 1
-                            End If
-                        End If
+                If Not Me.Model Is Nothing Then
+                    For Each mesh As ModelMesh In Me.Model.Meshes
+                        For Each part As ModelMeshPart In mesh.MeshParts
+                            Me._cachedVertexCount += CInt(part.VertexBuffer.VertexCount / 3)
+                        Next
                     Next
-
-                    Me._cachedVertexCount = min
                 Else
-                    Me._cachedVertexCount = 0
+                    If Not Me.BaseModel Is Nothing Then
+                        Dim c As Integer = CInt(Me.BaseModel.vertexBuffer.VertexCount / 3)
+                        Dim min As Integer = 0
+
+                        For i = 0 To Me.TextureIndex.Length - 1
+                            If i <= c - 1 Then
+                                If TextureIndex(i) > -1 Then
+                                    min += 1
+                                End If
+                            End If
+                        Next
+
+                        Me._cachedVertexCount = min
+                    Else
+                        Me._cachedVertexCount = 0
+                    End If
                 End If
             End If
             Return Me._cachedVertexCount