diff --git a/src/game/server/bmodels.cpp b/src/game/server/bmodels.cpp
index 3fa00f205..c07e8e0aa 100644
--- a/src/game/server/bmodels.cpp
+++ b/src/game/server/bmodels.cpp
@@ -260,8 +260,9 @@ void CFuncVehicleClip::InputDisable( inputdata_t &data )
 
 //============================= FUNC_CONVEYOR =======================================
 
-#define SF_CONVEYOR_VISUAL		0x0001
-#define SF_CONVEYOR_NOTSOLID	0x0002
+#define SF_CONVEYOR_VISUAL			0x0001
+#define SF_CONVEYOR_NOTSOLID		0x0002
+#define SF_CONVEYOR_START_DISABLED	0x0003
 
 class CFuncConveyor : public CFuncWall
 {
@@ -293,9 +294,10 @@ LINK_ENTITY_TO_CLASS( func_conveyor, CFuncConveyor );
 BEGIN_DATADESC( CFuncConveyor )
 
 	DEFINE_INPUTFUNC( FIELD_VOID, "ToggleDirection", InputToggleDirection ),
-	DEFINE_INPUTFUNC( FIELD_VOID, "SetSpeed", InputSetSpeed ),
+	DEFINE_INPUTFUNC( FIELD_FLOAT, "SetSpeed", InputSetSpeed ),
 
 	DEFINE_KEYFIELD( m_vecMoveDir, FIELD_VECTOR, "movedir" ),
+	DEFINE_KEYFIELD( m_flSpeed, FIELD_FLOAT, "speed" ),
 	DEFINE_FIELD( m_flConveyorSpeed, FIELD_FLOAT ),
 
 END_DATADESC()
@@ -328,8 +330,13 @@ void CFuncConveyor::Spawn( void )
 		AddSolidFlags( FSOLID_NOT_SOLID );
 	}
 
-	if ( m_flSpeed == 0 )
-		m_flSpeed = 100;
+	if ( !HasSpawnFlags( SF_CONVEYOR_VISUAL ) )
+	{
+		if ( m_flSpeed == 0 )
+		{
+			m_flSpeed = 100;
+		}
+	}
 
 	UpdateSpeed( m_flSpeed );
 }