diff --git a/src/NotesWriterSSC.cpp b/src/NotesWriterSSC.cpp
index fefce24b10..77578908f8 100644
--- a/src/NotesWriterSSC.cpp
+++ b/src/NotesWriterSSC.cpp
@@ -108,13 +108,10 @@ static void GetTimingTags( vector<RString> &lines, TimingData timing, bool bIsSo
 			w.Write( ss->m_iStartRow, ss->m_fStopSeconds );
 	w.Finish();
 	
-	if( !bIsSong )
-	{
-		w.Init( "WARPS" );
-		FOREACH_CONST( WarpSegment, timing.m_WarpSegments, ws )
-			w.Write( ws->m_iStartRow, ws->m_fLengthBeats );
-		w.Finish();
-	}
+	w.Init( "WARPS" );
+	FOREACH_CONST( WarpSegment, timing.m_WarpSegments, ws )
+		w.Write( ws->m_iStartRow, ws->m_fLengthBeats );
+	w.Finish();
 	
 	ASSERT( !timing.m_vTimeSignatureSegments.empty() );
 	w.Init( "TIMESIGNATURES" );
diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 4b0f056f8c..cc800e43cb 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -3231,7 +3231,6 @@ void ScreenEdit::DisplayTimingMenu()
 	
 	g_TimingDataInformation.rows[tickcount].bEnabled = GAMESTATE->m_bIsUsingStepTiming;
 	g_TimingDataInformation.rows[combo].bEnabled = GAMESTATE->m_bIsUsingStepTiming;
-	g_TimingDataInformation.rows[warp].bEnabled = GAMESTATE->m_bIsUsingStepTiming;
 	g_TimingDataInformation.rows[speed_percent].bEnabled = GAMESTATE->m_bIsUsingStepTiming;
 	g_TimingDataInformation.rows[speed_wait].bEnabled = GAMESTATE->m_bIsUsingStepTiming;
 	g_TimingDataInformation.rows[speed_mode].bEnabled = GAMESTATE->m_bIsUsingStepTiming;