diff --git a/Engine/source/T3D/rigidShape.cpp b/Engine/source/T3D/rigidShape.cpp
index 8eeaffb3f..cf26f8ea9 100644
--- a/Engine/source/T3D/rigidShape.cpp
+++ b/Engine/source/T3D/rigidShape.cpp
@@ -263,6 +263,7 @@ RigidShapeData::RigidShapeData()
 
    dustTrailEmitter = NULL;
    dustTrailID = 0;
+   _setShape(ShapeAsset::smNoShapeAssetFallback);
 }
 
 RigidShapeData::~RigidShapeData()
diff --git a/Templates/BaseGame/game/core/rendering/shapes/noshape.dts b/Templates/BaseGame/game/core/rendering/shapes/noshape.dts
index a7a64cf10..81720460c 100644
Binary files a/Templates/BaseGame/game/core/rendering/shapes/noshape.dts and b/Templates/BaseGame/game/core/rendering/shapes/noshape.dts differ