diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 8e1d1e5231..6f90c67ef6 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -3775,7 +3775,6 @@ LayerResult GCode::process_layer(
             gcode += writer().set_input_shaping('A', print.calib_params().start, 0.f);
         } else {
             if (print.calib_params().freqStartX == print.calib_params().freqStartY && print.calib_params().freqEndX == print.calib_params().freqEndY) {
-                gcode += writer().set_junction_deviation(0.25);
                 gcode += writer().set_input_shaping('A', 0.f, (print.calib_params().freqStartX) + ((print.calib_params().freqEndX)-(print.calib_params().freqStartX)) * (m_layer_index - 2) / (m_layer_count - 3));
             } else {
                 gcode += writer().set_input_shaping('X', 0.f, (print.calib_params().freqStartX) + ((print.calib_params().freqEndX)-(print.calib_params().freqStartX)) * (m_layer_index - 2) / (m_layer_count - 3));
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 6df4bd6044..c22b68e2c2 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -10163,6 +10163,8 @@ void Plater::calib_input_shaping_freq(const Calib_Params& params)
     auto filament_config = &wxGetApp().preset_bundle->filaments.get_edited_preset().config;
     filament_config->set_key_value("slow_down_layer_time", new ConfigOptionFloats { 2.0 });
     filament_config->set_key_value("filament_max_volumetric_speed", new ConfigOptionFloats { 200 });
+    //filament_config->set_key_value("enable_pressure_advance", new ConfigOptionBoolsNullable {false });
+    filament_config->set_key_value("pressure_advance", new ConfigOptionFloats { 0.0 });
     print_config->set_key_value("enable_overhang_speed", new ConfigOptionBool { false });
     print_config->set_key_value("timelapse_type", new ConfigOptionEnum<TimelapseType>(tlTraditional));
     print_config->set_key_value("wall_loops", new ConfigOptionInt(1));
@@ -10198,7 +10200,9 @@ void Plater::calib_input_shaping_damp(const Calib_Params& params)
     auto filament_config = &wxGetApp().preset_bundle->filaments.get_edited_preset().config;
     filament_config->set_key_value("slow_down_layer_time", new ConfigOptionFloats { 2.0 });
     filament_config->set_key_value("filament_max_volumetric_speed", new ConfigOptionFloats { 200 });
-    print_config->set_key_value("enable_overhang_speed", new ConfigOptionBool { false });
+    //filament_config->set_key_value("enable_pressure_advance", new ConfigOptionBoolsNullable{false});
+    filament_config->set_key_value("pressure_advance", new ConfigOptionFloats{0.0});
+    print_config->set_key_value("enable_overhang_speed", new ConfigOptionBool{false});
     print_config->set_key_value("timelapse_type", new ConfigOptionEnum<TimelapseType>(tlTraditional));
     print_config->set_key_value("wall_loops", new ConfigOptionInt(1));
     print_config->set_key_value("top_shell_layers", new ConfigOptionInt(0));
@@ -10232,8 +10236,10 @@ void Plater::calib_junction_deviation(const Calib_Params& params)
     auto print_config = &wxGetApp().preset_bundle->prints.get_edited_preset().config;
     auto filament_config = &wxGetApp().preset_bundle->filaments.get_edited_preset().config;
     filament_config->set_key_value("slow_down_layer_time", new ConfigOptionFloats { 2.0 });
-    filament_config->set_key_value("filament_max_volumetric_speed", new ConfigOptionFloats { 200 });
-    print_config->set_key_value("enable_overhang_speed", new ConfigOptionBool { false });
+    filament_config->set_key_value("filament_max_volumetric_speed", new ConfigOptionFloats{200});
+    // filament_config->set_key_value("enable_pressure_advance", new ConfigOptionBoolsNullable{false});
+    filament_config->set_key_value("pressure_advance", new ConfigOptionFloats{0.0});
+    print_config->set_key_value("enable_overhang_speed", new ConfigOptionBool{false});
     print_config->set_key_value("timelapse_type", new ConfigOptionEnum<TimelapseType>(tlTraditional));
     print_config->set_key_value("wall_loops", new ConfigOptionInt(1));
     print_config->set_key_value("top_shell_layers", new ConfigOptionInt(0));