diff --git a/couchpotato/core/media/show/_base/main.py b/couchpotato/core/media/show/_base/main.py
index 38b3353..2e0146d 100644
--- a/couchpotato/core/media/show/_base/main.py
+++ b/couchpotato/core/media/show/_base/main.py
@@ -86,7 +86,7 @@ class ShowBase(MediaBase):
             # Can we make a base function to do this stuff?
 
             # Remove season info for later use (save separately)
-            season_info = info.get('seasons', [])
+            season_info = info.get('seasons', {})
 
             # Make sure we don't nest in_wanted data
             del info['identifiers']
diff --git a/couchpotato/core/media/show/providers/info/thetvdb.py b/couchpotato/core/media/show/providers/info/thetvdb.py
index cd40fd0..30c9700 100644
--- a/couchpotato/core/media/show/providers/info/thetvdb.py
+++ b/couchpotato/core/media/show/providers/info/thetvdb.py
@@ -270,6 +270,22 @@ class TheTVDb(ShowProvider):
 
         show_data = dict((k, v) for k, v in show_data.iteritems() if v)
 
+        # Parse season and episode data
+        seasons = {}
+        episodes = get('episodes')
+        for episode in episodes:
+            episode_nr = episode.get('nr')
+            episode_season = episode.get('season')
+
+            # Create season
+            if seasons.get(episode_season):
+                seasons[episode_season] = {
+                    'episodes': {}
+                }
+
+            # Add episode information
+            seasons[episode_season]['episodes'][episode_nr] = self._parseEpisode(show, episode)
+
         # Add alternative titles
         # try:
         #     raw = self.tvdb.search(show['seriesname'])