diff --git a/src/tmdb/convertTmdbToMovie.js b/src/tmdb/convertTmdbToMovie.js
index 2f95ccb..4a166b3 100644
--- a/src/tmdb/convertTmdbToMovie.js
+++ b/src/tmdb/convertTmdbToMovie.js
@@ -2,14 +2,26 @@ const Movie = require('src/movie/movie');
 
 function convertTmdbToMovie(tmdbMovie) {
 	const movie = new Movie();
-	movie.title = tmdbMovie.title;
-	movie.type = 'movie';
+	if (tmdbMovie.media_type === 'movie') {
+		movie.title = tmdbMovie.title;
+		movie.type = tmdbMovie.media_type;
 
-	if (tmdbMovie.release_date !== undefined) {
-		movie.release_date = new Date(tmdbMovie.release_date);
-		movie.year = movie.release_date.getFullYear();
+		if (tmdbMovie.release_date !== undefined) {
+			movie.release_date = new Date(tmdbMovie.release_date);
+			movie.year = movie.release_date.getFullYear();
+		}
+	} else if (tmdbMovie.media_type === 'tv') {
+		movie.title = tmdbMovie.name;
+		movie.type = 'show';
+		if (tmdbMovie.first_air_date !== undefined) {
+			movie.release_date = new Date(tmdbMovie.first_air_date);
+			movie.year = movie.release_date.getFullYear();
+		}
 	}
 
+	movie.poster = tmdbMovie.poster_path;
+	movie.background = tmdbMovie.backdrop_path;
+
 	return movie;
 }