diff --git a/includes/admin/services/class-rop-twitter-service.php b/includes/admin/services/class-rop-twitter-service.php
index bb49f7bd6..3647c9822 100644
--- a/includes/admin/services/class-rop-twitter-service.php
+++ b/includes/admin/services/class-rop-twitter-service.php
@@ -495,10 +495,13 @@ private function twitter_media_post( $post_details, $api ) {
 		}
 
 		$upload_args = array(
-			'media' => $media_path,
-			'media_type' => $post_details['mimetype']['type'],
+			'media'          => $media_path,
+			'media_type'     => $post_details['mimetype']['type'],
+			'media_category' => 'tweet_image',
 		);
 
+		$options['chunkedUpload'] = false;
+
 		if ( ! empty( $photon_bypass ) && class_exists( 'Jetpack_Photon' ) ) {
 			// Re-enable Jetpack Photon filter.
 			add_filter( 'image_downsize', array( Jetpack_Photon::instance(), 'filter_image_downsize' ), 10, 3 );
@@ -511,6 +514,7 @@ private function twitter_media_post( $post_details, $api ) {
 			$upload_args['media_type']     = $post_details['mimetype']['type'];
 			$upload_args['media_category'] = 'tweet_video';
 			$status_check                  = true;
+			$options['chunkedUpload']      = true;
 		}
 
 		// Overwrite media_type and category if is Gif Post
@@ -518,12 +522,12 @@ private function twitter_media_post( $post_details, $api ) {
 			$upload_args['media_type']     = $post_details['mimetype']['type'];
 			$upload_args['media_category'] = 'tweet_gif';
 			$status_check                  = true;
+			$options['chunkedUpload']      = true;
 		}
 
 		$this->logger->info( 'Before upload to twitter . ' . json_encode( $upload_args ) );
 		$api->setTimeouts( 10, 60 );
 		$api->setApiVersion( '2' );
-		$options['chunkedUpload'] = true;
 		$media_response = $api->upload( 'media/upload', $upload_args, $options );
 
 		if ( isset( $media_response->data->id ) ) {