diff --git a/matlab/evaluate_smoother.m b/matlab/evaluate_smoother.m
index 32f58a280..a9968a0f8 100644
--- a/matlab/evaluate_smoother.m
+++ b/matlab/evaluate_smoother.m
@@ -46,6 +46,10 @@ global options_ M_ bayestopt_ oo_ estim_params_   % estim_params_ may be emty
 
 persistent dataset_
 
+if ischar(parameters) && strcmp(parameters,'calibration')
+    options_.smoother=1;
+end
+
 if isempty(dataset_) || isempty(bayestopt_)
     [dataset_,xparam1, M_, options_, oo_, estim_params_,bayestopt_] = dynare_estimation_init(var_list, M_.fname, [], M_, options_, oo_, estim_params_, bayestopt_);
 end