diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index ce3b31dabcc3c1febc9a3a187f21622ecdf72584..3910042516be01a8fca029a5451f043eb7e199f6 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -690,7 +690,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