diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp
index d4fb4ec5ce..06553696ba 100644
--- a/src/g_shared/a_weapons.cpp
+++ b/src/g_shared/a_weapons.cpp
@@ -520,6 +520,7 @@ void AWeapon::PostMorphWeapon ()
 	Owner->player->PendingWeapon = WP_NOCHANGE;
 	Owner->player->ReadyWeapon = this;
 	Owner->player->psprites[ps_weapon].sy = WEAPONBOTTOM;
+	Owner->player->refire = 0;
 	P_SetPsprite (Owner->player, ps_weapon, GetUpState());
 }
 
diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index 03ba4cd57b..4eb8b7d3e6 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -186,6 +186,7 @@ void P_BringUpWeapon (player_t *player)
 			S_Sound (player->mo, CHAN_WEAPON, weapon->UpSound, 1, ATTN_NORM);
 		}
 		newstate = weapon->GetUpState ();
+		player->refire = 0;
 	}
 	else
 	{
diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index b59cb6c92a..f10e961b96 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -1581,12 +1581,6 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ThrowGrenade)
 		bo->velx += self->velx >> 1;
 		bo->vely += self->vely >> 1;
 		bo->target= self;
-		if (bo->flags4&MF4_RANDOMIZE) 
-		{
-			bo->tics -= pr_grenade() & 3;
-			if (bo->tics < 1)
-				bo->tics = 1;
-		}
 		P_CheckMissileSpawn (bo);
 	} 
 	else ACTION_SET_RESULT(false);