diff --git a/autoloads/song_loader/song_loaders/DSCConverter.gd b/autoloads/song_loader/song_loaders/DSCConverter.gd
index b4c12164..760cff5a 100644
--- a/autoloads/song_loader/song_loaders/DSCConverter.gd
+++ b/autoloads/song_loader/song_loaders/DSCConverter.gd
@@ -438,7 +438,7 @@ static func convert_dsc_opcodes_to_chart(r: Array, opcode_map: DSCOpcodeMap, off
 						
 						# Set sustain length
 						if opcode.params[1] != -1:
-							(note_d as HBSustainNote).end_time = time + flying_time + (opcode.params[1] / 100.0) + offset
+							(note_d as HBSustainNote).end_time = time + flying_time + (opcode.params[1] / 100.0)
 							found_sustain_length = true
 					
 					elif is_nc_rush(opcode.params[0]):
@@ -591,5 +591,7 @@ static func convert_dsc_opcodes_to_chart(r: Array, opcode_map: DSCOpcodeMap, off
 		for layer in chart.layers:
 			for timing_point in layer.timing_points:
 				timing_point.time -= music_start_offset
+				if timing_point is HBSustainNote:
+					timing_point.end_time -= music_start_offset
 	
 	return [chart, timing_changes]