diff --git a/wptv2/plugins/wordpresstv-upload-subtitles/wordpresstv-upload-subtitles.php b/wptv2/plugins/wordpresstv-upload-subtitles/wordpresstv-upload-subtitles.php
index 9ee766e66..6848190d9 100644
--- a/wptv2/plugins/wordpresstv-upload-subtitles/wordpresstv-upload-subtitles.php
+++ b/wptv2/plugins/wordpresstv-upload-subtitles/wordpresstv-upload-subtitles.php
@@ -139,6 +139,8 @@ class WordPressTV_Subtitles_Upload {
 		$language = $available_languages[ $language ];
 
 		$video_data       = function_exists( 'video_get_info_by_blogpostid' ) ? video_get_info_by_blogpostid( get_current_blog_id(), $video_id ) : new StdClass;
+		l();
+		l($video_data->guid);
 		$video_attachment = get_post( $video_id );
 		if ( empty( $video_data ) || empty( $video_attachment ) ) {
 			wp_die( 'Invalid form data.' );
@@ -150,11 +152,6 @@ class WordPressTV_Subtitles_Upload {
 			wp_die( 'You can not subtitle this video.' );
 		}
 
-		$tracks = class_exists( 'VideoPress_Subtitles' ) ? VideoPress_Subtitles::get_tracks( $video_data->guid ) : array();
-		if ( ! empty( $tracks[ $language['key'] ] ) ) {
-			$this->error( 8 );
-		}
-
 		if ( empty( $_FILES['wptv_subtitles_file']['name'] ) ) {
 			$this->error( 1 );
 		}
diff --git a/wptv2/upload-subtitles-template.php b/wptv2/upload-subtitles-template.php
index e5c939bb2..ec221a5ce 100644
--- a/wptv2/upload-subtitles-template.php
+++ b/wptv2/upload-subtitles-template.php
@@ -276,7 +276,7 @@ if ( ! empty( $_REQUEST['error'] ) ) {
 						<select name="wptv_language">
 							<?php $tracks = VideoPress_Subtitles::get_tracks( $video->guid ); ?>
 							<?php foreach ( VideoPress_Subtitles::get_languages() as $value => $language ) : ?>
-								<option value="<?php echo esc_attr( $value ); ?>" <?php disabled( ! empty( $tracks[ $value ] ) ); ?> ><?php echo esc_html( $language['localized_label'] ); ?></option>
+								<option value="<?php echo esc_attr( $value ); ?>" ><?php echo esc_html( $language['localized_label'] ); ?></option>
 							<?php endforeach; ?>
 						</select>
 					</td>