diff --git a/matlab/UnivariateSpectralDensity.m b/matlab/UnivariateSpectralDensity.m
index e199a9976c7e01bcc6b0b22c362e669bf95d536f..31ce57f69c22e0cdbd55772780bb6d2d120ea2f3 100644
--- a/matlab/UnivariateSpectralDensity.m
+++ b/matlab/UnivariateSpectralDensity.m
@@ -46,8 +46,6 @@ end
 
 if isoctave
     warning('off', 'Octave:divide-by-zero')
-else
-    warning off MATLAB:dividebyzero
 end
 if nargin<2
     var_list = {};
@@ -146,8 +144,6 @@ oo_.SpectralDensity.density=f;
 
 if isoctave
     warning('on', 'Octave:divide-by-zero')
-else
-    warning on MATLAB:dividebyzero
 end
 
 if ~options_.nograph
diff --git a/matlab/dynare_identification.m b/matlab/dynare_identification.m
index 0dd48f0714729f7039453dc300fb11b6084a5858..b3df181c2d986c610a1fccc645a71c0c89ae85c9 100644
--- a/matlab/dynare_identification.m
+++ b/matlab/dynare_identification.m
@@ -99,7 +99,6 @@ else
     warning('off','MATLAB:plot:IgnoreImaginaryXYPart');
     warning('off','MATLAB:specgraph:private:specgraph:UsingOnlyRealComponentOfComplexData');
     warning('off','MATLAB:handle_graphics:exceptions:SceneNode');
-    warning('off','MATLAB:divideByZero');
     warning('off','MATLAB:log:logOfZero');
 end
 
diff --git a/matlab/th_autocovariances.m b/matlab/th_autocovariances.m
index eb65105bb6223c5029717f0e4e77bf1f4fc1c60f..81a115a6be3acde57d7c45316c4ce7966fc1fe9c 100644
--- a/matlab/th_autocovariances.m
+++ b/matlab/th_autocovariances.m
@@ -75,8 +75,6 @@ end
 endo_nbr = M_.endo_nbr;
 if isoctave
     warning('off', 'Octave:divide-by-zero')
-else
-    warning off MATLAB:dividebyzero
 end
 nar = options_.ar;
 Gamma_y = cell(nar+2,1);
@@ -291,6 +289,4 @@ else% ==> Theoretical filters.
 end
 if isoctave
     warning('on', 'Octave:divide-by-zero')
-else
-    warning on MATLAB:dividebyzero
 end