diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm
index a75ea331921..cf74e60080d 100644
--- a/code/modules/mob/living/carbon/metroid/life.dm
+++ b/code/modules/mob/living/carbon/metroid/life.dm
@@ -58,7 +58,7 @@
 		if(Discipline >= 5 && rabid)
 			if(prob(60)) rabid = 0
 
-		if(prob(20))
+		if(prob(10))
 			Discipline--
 
 
diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm
index 7424d98030f..f0e60859701 100644
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -458,8 +458,9 @@
 
 				spawn()
 					SStun = 1
-					sleep(rand(25,50))
-					SStun = 0
+					sleep(rand(45,60))
+					if(src)
+						SStun = 0
 
 				Victim = null
 				anchored = 0
@@ -487,6 +488,11 @@
 						if(Discipline == 1)
 							attacked = 0
 
+				spawn()
+					SStun = 1
+					sleep(rand(55,65))
+					if(src)
+						SStun = 0
 
 				Victim = null
 				anchored = 0
diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm
index be452ec2cb7..e38b557427f 100644
--- a/code/modules/mob/living/carbon/metroid/powers.dm
+++ b/code/modules/mob/living/carbon/metroid/powers.dm
@@ -142,7 +142,6 @@
 		else
 			icon_state = "baby metroid"
 
-	Victim = null
 	canmove = 1
 	anchored = 0
 
@@ -170,6 +169,8 @@
 
 		if(client) src << "<i>I have stopped feeding...</i>"
 
+	Victim = null
+
 /mob/living/carbon/metroid/proc/Feedstop()
 	if(Victim)
 		if(Victim.client) Victim << "[src] has let go of your head!"