diff --git a/sp/src/game/server/bmodels.cpp b/sp/src/game/server/bmodels.cpp
index e8291f8f604..dee05d0cda5 100644
--- a/sp/src/game/server/bmodels.cpp
+++ b/sp/src/game/server/bmodels.cpp
@@ -254,6 +254,9 @@ void CFuncVehicleClip::InputDisable( inputdata_t &data )
 
 #define SF_CONVEYOR_VISUAL		0x0001
 #define SF_CONVEYOR_NOTSOLID	0x0002
+#ifdef MAPBASE
+#define SF_CONVEYOR_START_DISABLED 0x0003
+#endif // MAPBASE
 
 class CFuncConveyor : public CFuncWall
 {
@@ -285,7 +288,7 @@ 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_FIELD( m_flConveyorSpeed, FIELD_FLOAT ),
@@ -320,8 +323,15 @@ void CFuncConveyor::Spawn( void )
 		AddSolidFlags( FSOLID_NOT_SOLID );
 	}
 
-	if ( m_flSpeed == 0 )
-		m_flSpeed = 100;
+	#ifdef MAPBASE
+	if (!HasSpawnFlags(SF_CONVEYOR_VISUAL))
+	#endif // MAPBASE
+	{
+		if (m_flSpeed == 0)
+		{
+			m_flSpeed = 100;
+		}
+	}
 
 	UpdateSpeed( m_flSpeed );
 }