diff --git a/lib/dbservice_web/controllers/teacher_controller.ex b/lib/dbservice_web/controllers/teacher_controller.ex
index 9ed0413a..fe687865 100644
--- a/lib/dbservice_web/controllers/teacher_controller.ex
+++ b/lib/dbservice_web/controllers/teacher_controller.ex
@@ -154,7 +154,10 @@ defmodule DbserviceWeb.TeacherController do
   end
 
   defp update_existing_teacher_with_user(conn, existing_teacher, params) do
-    with {:ok, %Teacher{} = teacher} <- Users.update_teacher_with_user(existing_teacher, params) do
+    user = Users.get_user!(existing_teacher.user_id)
+
+    with {:ok, %Teacher{} = teacher} <-
+           Users.update_teacher_with_user(existing_teacher, user, params) do
       conn
       |> put_status(:ok)
       |> render("show.json", teacher: teacher)
diff --git a/lib/dbservice_web/views/teacher_view.ex b/lib/dbservice_web/views/teacher_view.ex
index 31c0ff46..bf8a7b03 100644
--- a/lib/dbservice_web/views/teacher_view.ex
+++ b/lib/dbservice_web/views/teacher_view.ex
@@ -2,7 +2,6 @@ defmodule DbserviceWeb.TeacherView do
   use DbserviceWeb, :view
   alias DbserviceWeb.TeacherView
   alias DbserviceWeb.UserView
-  alias DbserviceWeb.SubjectView
   alias Dbservice.Repo
 
   def render("index.json", %{teacher: teacher}) do
@@ -24,7 +23,7 @@ defmodule DbserviceWeb.TeacherView do
       id: teacher.id,
       designation: teacher.designation,
       teacher_id: teacher.teacher_id,
-      subject: render_one(teacher.subject, SubjectView, "subject.json"),
+      subject_id: teacher.subject_id,
       user: render_one(teacher.user, UserView, "user.json")
     }
   end
@@ -34,7 +33,7 @@ defmodule DbserviceWeb.TeacherView do
       id: teacher.id,
       designation: teacher.designation,
       teacher_id: teacher.teacher_id,
-      subject: render_one(teacher.subject, SubjectView, "subject.json"),
+      subject_id: teacher.subject_id,
       user: render_one(teacher.user, UserView, "user.json")
     }
   end