diff --git a/src/p_map.c b/src/p_map.c
index 28c747997..ff83a22a4 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -345,25 +345,6 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 			}
 		}
 
-		if (object->player)
-		{
-			// Less friction when hitting springs
-			if (!object->player->tiregrease)
-			{
-				UINT8 i;
-				for (i = 0; i < 2; i++)
-				{
-					mobj_t *grease;
-					grease = P_SpawnMobj(object->x, object->y, object->z, MT_TIREGREASE);
-					P_SetTarget(&grease->target, object);
-					grease->angle = K_MomentumAngle(object);
-					grease->extravalue1 = i;
-				}
-
-				object->player->tiregrease = greasetics; //FixedMul(greasetics << FRACBITS, finalSpeed/72) >> FRACBITS
-			}
-		}
-
 		// Horizontal speed is used as a minimum thrust, not a direct replacement
 		finalSpeed = max(objectSpeed, finalSpeed);
 
@@ -386,6 +367,22 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 
 		object->player->springstars = max(vertispeed, horizspeed) / FRACUNIT / 2;
 		object->player->springcolor = starcolor;
+
+		// Less friction when hitting springs
+		if (!object->player->tiregrease)
+		{
+			UINT8 i;
+			for (i = 0; i < 2; i++)
+			{
+				mobj_t *grease;
+				grease = P_SpawnMobj(object->x, object->y, object->z, MT_TIREGREASE);
+				P_SetTarget(&grease->target, object);
+				grease->angle = K_MomentumAngle(object);
+				grease->extravalue1 = i;
+			}
+
+			object->player->tiregrease = greasetics; //FixedMul(greasetics << FRACBITS, finalSpeed/72) >> FRACBITS
+		}
 	}
 
 	return true;