diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp
index 91a049b1f3e..5e878b0ee48 100644
--- a/modules/bullet/collision_object_bullet.cpp
+++ b/modules/bullet/collision_object_bullet.cpp
@@ -285,10 +285,10 @@ void RigidCollisionObjectBullet::on_shapes_changed() {
 	const int size = shapes.size();
 	for (i = 0; i < size; ++i) {
 		shpWrapper = &shapes[i];
-		if (!shpWrapper->bt_shape) {
-			shpWrapper->bt_shape = shpWrapper->shape->create_bt_shape();
-		}
 		if (shpWrapper->active) {
+			if (!shpWrapper->bt_shape) {
+				shpWrapper->bt_shape = shpWrapper->shape->create_bt_shape();
+			}
 			compoundShape->addChildShape(shpWrapper->transform, shpWrapper->bt_shape);
 		} else {
 			compoundShape->addChildShape(shpWrapper->transform, BulletPhysicsServer::get_empty_shape());
diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp
index 49150484d9f..f51af93a31c 100644
--- a/modules/bullet/shape_bullet.cpp
+++ b/modules/bullet/shape_bullet.cpp
@@ -45,6 +45,7 @@ ShapeBullet::~ShapeBullet() {}
 
 btCollisionShape *ShapeBullet::prepare(btCollisionShape *p_btShape) const {
 	p_btShape->setUserPointer(const_cast<ShapeBullet *>(this));
+	p_btShape->setMargin(0.);
 	return p_btShape;
 }