diff --git a/matlab/dynare_estimation.m b/matlab/dynare_estimation.m
index 473616a12..2bd87a064 100644
--- a/matlab/dynare_estimation.m
+++ b/matlab/dynare_estimation.m
@@ -649,7 +649,7 @@ if (any(bayestopt_.pshape  >0 ) & options_.mh_replic) | (any(bayestopt_.pshape >
   if options_.mh_replic
     metropolis(xparam1,invhess,gend,data,rawdata,bounds);
   end
-  if ~options_.nodiagnostic
+  if ~options_.nodiagnostic & options_.mh_replic > 1000 & options_.nblocks > 1
     McMCDiagnostics;
   end
   %% Here i discard first half of the draws:
@@ -1133,4 +1133,4 @@ end %	<--	if ML estimation, posterior mode without metropolis-hastings or metrop
 %					workspace when completed.
 % SA 08-04-2004		Corrected a bug related to the display of the Smooth shocks and variables plots,
 %					for ML and posterior mode estimation. 
-%  SA 09-03-2004		Compilation of TeX appendix moved to dynare.m.
\ No newline at end of file
+%  SA 09-03-2004		Compilation of TeX appendix moved to dynare.m.