diff --git a/src/gs-entbase/client/env_particle.qc b/src/gs-entbase/client/env_particle.qc
index 28a307b9..5bc6f2cf 100644
--- a/src/gs-entbase/client/env_particle.qc
+++ b/src/gs-entbase/client/env_particle.qc
@@ -44,13 +44,9 @@ void env_particle::customphysics(void)
 {
 	vector vecPlayer;
 
-#ifdef WASTES
-	vecPlayer = viewClient.vecPlayerOrigin;
-#else
 	int s = (float)getproperty(VF_ACTIVESEAT);
 	pSeat = &g_seats[s];
 	vecPlayer = pSeat->m_vecPredictedOrigin;
-#endif
 	
 	if (checkpvs(vecPlayer, this) == FALSE) {
 		return;
@@ -73,12 +69,6 @@ void env_particle::customphysics(void)
 	m_flNextTime = time + m_flWait;
 }
 
-void env_particle::env_particle(void)
-{
-	drawmask = MASK_ENGINE;
-	Init();
-}
-
 void env_particle::SpawnKey(string strField, string strKey)
 {
 	switch (strField) {
@@ -101,3 +91,11 @@ void env_particle::SpawnKey(string strField, string strKey)
 		CBaseEntity::SpawnKey(strField, strKey);
 	}
 }
+
+void env_particle::env_particle(void)
+{
+	drawmask = MASK_ENGINE;
+	Init();
+	setorigin(this, origin);
+	setsize(this, [0,0,0], [0,0,0]);
+}