diff --git a/shows/shows.go b/shows/shows.go
index 73d87fe..31cfbd0 100644
--- a/shows/shows.go
+++ b/shows/shows.go
@@ -165,14 +165,16 @@ func (s *Show) GetDetailsAsUser(db *sqlx.DB, user *users.User, log *logrus.Entry
 	if err != nil {
 		return err
 	}
-	err = s.Add(db)
-	if err != nil {
-		return err
-	}
+
 	s.Episodes = []*Episode{}
 	for _, pe := range s.Show.Episodes {
 		s.Episodes = append(s.Episodes, &Episode{ShowEpisode: *pe})
 	}
+
+	err = s.Add(db)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -197,10 +199,8 @@ func (s *Show) Add(db *sqlx.DB) error {
 	}
 	s.ID = id
 
-	// When add a show to database use polochon episode details
-	// so s.Show.Episodes
-	for _, pEp := range s.Show.Episodes {
-		e := &Episode{ShowEpisode: *pEp, ShowID: s.ID}
+	for _, e := range s.Episodes {
+		e.ShowID = s.ID
 		err = e.Add(db)
 		if err != nil {
 			return err