diff --git a/src/gs-entbase/shared/NSSurfacePropEntity.qc b/src/gs-entbase/shared/NSSurfacePropEntity.qc
index 16d95cab..fc8c1a6b 100644
--- a/src/gs-entbase/shared/NSSurfacePropEntity.qc
+++ b/src/gs-entbase/shared/NSSurfacePropEntity.qc
@@ -128,7 +128,7 @@ NSSurfacePropEntity::Respawn(void)
 	NSRenderableEntity::Respawn();
 
 	/* only use spawndata's health if we aren't overriding it */
-	if (HasPropData() == false && sh <= 0) {
+	if (HasPropData() != false && sh <= 0) {
 		health = (float)GetPropData(PROPINFO_HEALTH);
 	} else {
 		health = sh;
@@ -343,6 +343,7 @@ NSSurfacePropEntity::NSSurfacePropEntity(void)
 #ifdef SERVER
 	m_iPropData = -1;
 	m_iMaterial = -1;
+	max_health = 100;
 
 	super::NSRenderableEntity();