diff --git a/src/fix_langevin.cpp b/src/fix_langevin.cpp
index d49ad61371..36ea47daf6 100644
--- a/src/fix_langevin.cpp
+++ b/src/fix_langevin.cpp
@@ -177,8 +177,6 @@ FixLangevin::FixLangevin(LAMMPS *lmp, int narg, char **arg) :
     }
   }
 
-  if (tallyflag && zeroflag && comm->me == 0)
-    error->warning(FLERR,"Energy tally does not account for 'zero yes'");
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/fix_langevin.h b/src/fix_langevin.h
index 2883ac9ea2..024e7a9539 100644
--- a/src/fix_langevin.h
+++ b/src/fix_langevin.h
@@ -104,12 +104,6 @@ E: Fix langevin period must be > 0.0
 
 The time window for temperature relaxation must be > 0
 
-W: Energy tally does not account for 'zero yes'
-
-The energy removed by using the 'zero yes' flag is not accounted
-for in the energy tally and thus energy conservation cannot be
-monitored in this case.
-
 E: Fix langevin omega requires atom style sphere
 
 Self-explanatory.