diff --git a/matlab/evaluate_steady_state.m b/matlab/evaluate_steady_state.m
index 7b35ffce9d76b591face93263e3784fbcafa5d24..6247d88ff792de088bd05661503cbf6422d3bc72 100644
--- a/matlab/evaluate_steady_state.m
+++ b/matlab/evaluate_steady_state.m
@@ -46,11 +46,9 @@ steadystate_flag = options.steadystate_flag;
 params = M.params;
 exo_ss = [oo.exo_steady_state; oo.exo_det_steady_state];
 
-if length(M.aux_vars) > 0 && ~steadystate_flag
+if length(M.aux_vars) > 0 && ~steadystate_flag && M.set_auxiliary_variables
     h_set_auxiliary_variables = str2func([M.fname '.set_auxiliary_variables']);
-    if M.set_auxiliary_variables
-        ys_init = h_set_auxiliary_variables(ys_init,exo_ss,M.params);
-    end
+    ys_init = h_set_auxiliary_variables(ys_init,exo_ss,M.params);
 end
 
 if options.ramsey_policy