diff --git a/src/game/server/subs.cpp b/src/game/server/subs.cpp
index b2bf003f444..e7ad735453c 100644
--- a/src/game/server/subs.cpp
+++ b/src/game/server/subs.cpp
@@ -22,10 +22,10 @@ void CPointEntity::Spawn( void )
 }
 
 
-class CNullEntity : public CBaseEntity
+class CNullEntity : public CServerOnlyEntity
 {
 public:
-	DECLARE_CLASS( CNullEntity, CBaseEntity );
+	DECLARE_CLASS( CNullEntity, CServerOnlyEntity );
 
 	void Spawn( void );
 };
diff --git a/src/game/server/world.cpp b/src/game/server/world.cpp
index 55c1e7b527f..4f9d8263483 100644
--- a/src/game/server/world.cpp
+++ b/src/game/server/world.cpp
@@ -43,10 +43,10 @@ extern CUtlMemoryPool g_EntityListPool;
 
 #define SF_DECAL_NOTINDEATHMATCH		2048
 
-class CDecal : public CPointEntity
+class CDecal : public CServerOnlyPointEntity
 {
 public:
-	DECLARE_CLASS( CDecal, CPointEntity );
+	DECLARE_CLASS( CDecal, CServerOnlyPointEntity );
 
 	void	Spawn( void );
 	bool	KeyValue( const char *szKeyName, const char *szValue );
@@ -240,10 +240,10 @@ bool CDecal::KeyValue( const char *szKeyName, const char *szValue )
 //-----------------------------------------------------------------------------
 // Purpose: Projects a decal against a prop
 //-----------------------------------------------------------------------------
-class CProjectedDecal : public CPointEntity
+class CProjectedDecal : public CServerOnlyPointEntity
 {
 public:
-	DECLARE_CLASS( CProjectedDecal, CPointEntity );
+	DECLARE_CLASS( CProjectedDecal, CServerOnlyPointEntity );
 
 	void	Spawn( void );
 	bool	KeyValue( const char *szKeyName, const char *szValue );