diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index 695027dba..b1cdde266 100644
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -177,6 +177,12 @@ void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape)
                                         (TopAbs_ShapeEnum) ancType,
                                         _mapAncestors );
   }
+  else
+  {
+    _isShapeToMesh = false;
+    _shapeDiagonal = 0.0;
+    _myMeshDS->ShapeToMesh( PseudoShape() );
+  }
 }
 
 //=======================================================================