diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 5d22781334e4407e42818e6c9884ba2778dbf297..a6a7c185651c6e663619fbdf35c491466418f67f 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -708,7 +708,8 @@ static void runGmshClient(const std::string &action)
       // changed
       modelName = GModel::current()->getName();
       geometry_reload_cb(0, 0);
-      if(FlGui::instance()->onelab->meshAuto()){
+      if(!GModel::current()->empty() &&
+         FlGui::instance()->onelab->meshAuto()){
         mesh_3d_cb(0, 0);
         CreateOutputFile(mshFileName, CTX::instance()->mesh.fileFormat);
       }