diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc
index f7b16c89..bb4f2507 100644
--- a/server/gameserver/android.cc
+++ b/server/gameserver/android.cc
@@ -83,6 +83,7 @@ void Android::InternalUpdate(int delta_time)
         return;
     }
     if (poisoning) {
+        poisoning_time += delta_time;
         UpdatePoisoning();
     }
     if (action_type != AT_None) {
diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc
index e32f1ad7..0c7262e9 100644
--- a/server/gameserver/hero.cc
+++ b/server/gameserver/hero.cc
@@ -69,6 +69,10 @@ void Hero::Initialize()
 void Hero::Update(int delta_time)
 {
     ++updated_times_;
+    if (poisoning) {
+        poisoning_time += delta_time;
+        UpdatePoisoning();
+    }
 }
 
 void Hero::OnExplosionHit(Explosion* e)