diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index 15048e73fe627c2f637cfa10c5773da7cefdde04..b4b68d1dabf0023b39f122e30195f3f6fef270df 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -693,7 +693,7 @@ if options_.heteroskedastic_filter
     end
 end
 
-if options_.occbin.likelihood.status && options_.occbin.likelihood.inversion_filter
+if (options_.occbin.likelihood.status && options_.occbin.likelihood.inversion_filter) || (options_.occbin.smoother.status && options_.occbin.smoother.inversion_filter)
     if isempty(options_.occbin.likelihood.IVF_shock_observable_mapping)
         options_.occbin.likelihood.IVF_shock_observable_mapping=find(diag(M.Sigma_e)~=0);
     else