diff --git a/app.py b/app.py
index c4ea63f..14ae621 100644
--- a/app.py
+++ b/app.py
@@ -602,7 +602,8 @@ def save_speaking():
 def generate_speaking_video():
     try:
         data = request.get_json()
-        sp1_result = create_video(data["question"], random.choice(list(AvatarEnum)))
+        avatar = data.get("avatar", random.choice(list(AvatarEnum)).value)
+        sp1_result = create_video(data["question"], avatar)
         if sp1_result is not None:
             sound_file_path = VIDEO_FILES_PATH + sp1_result
             firebase_file_path = FIREBASE_SPEAKING_VIDEO_FILES_PATH + sp1_result
@@ -633,7 +634,7 @@ def generate_interactive_video():
     try:
         data = request.get_json()
         sp3_questions = []
-        avatar = random.choice(list(AvatarEnum))
+        avatar = data.get("avatar", random.choice(list(AvatarEnum)).value)
 
         app.logger.info('Creating videos for speaking part 3')
         for question in data["questions"]:
diff --git a/helper/heygen_api.py b/helper/heygen_api.py
index 5f69444..76b0cb1 100644
--- a/helper/heygen_api.py
+++ b/helper/heygen_api.py
@@ -117,9 +117,9 @@ def create_videos_and_save_to_db(exercises, template, id):
     save_to_db_with_id("speaking", template, id)
     app.app.logger.info('Saved speaking to DB with id ' + id + " : " + str(template))
 
-def create_video(text, avatar: AvatarEnum):
+def create_video(text, avatar):
     # POST TO CREATE VIDEO
-    create_video_url = 'https://api.heygen.com/v2/template/' + avatar.value + '/generate'
+    create_video_url = 'https://api.heygen.com/v2/template/' + avatar + '/generate'
     data = {
         "test": False,
         "caption": False,