diff --git a/src/sora_client_context.cpp b/src/sora_client_context.cpp
index e920134e..2e4ca242 100644
--- a/src/sora_client_context.cpp
+++ b/src/sora_client_context.cpp
@@ -2,6 +2,7 @@
 
 // WebRTC
 #include <api/create_peerconnection_factory.h>
+#include <api/enable_media.h>
 #include <api/rtc_event_log/rtc_event_log_factory.h>
 #include <api/task_queue/default_task_queue_factory.h>
 #include <media/engine/webrtc_media_engine.h>
@@ -55,7 +56,8 @@ std::shared_ptr<SoraClientContext> SoraClientContext::Create(
   dependencies.worker_thread = c->worker_thread_.get();
   dependencies.signaling_thread = c->signaling_thread_.get();
   dependencies.task_queue_factory = webrtc::CreateDefaultTaskQueueFactory();
-  dependencies.call_factory = webrtc::CreateCallFactory();
+  // TODO(enm10k): call_factory の移行先を調べる
+  // dependencies.call_factory = webrtc::CreateCallFactory();
   dependencies.event_log_factory =
       absl::make_unique<webrtc::RtcEventLogFactory>(
           dependencies.task_queue_factory.get());
@@ -115,8 +117,10 @@ std::shared_ptr<SoraClientContext> SoraClientContext::Create(
     c->config_.configure_media_dependencies(dependencies, media_dependencies);
   }
 
-  dependencies.media_engine =
-      cricket::CreateMediaEngine(std::move(media_dependencies));
+  // TODO(enm10k): media_factory の移行方法が正しいか確認する
+  // dependencies.media_factory =
+  //     cricket::CreateMediaEngine(std::move(media_dependencies));
+  webrtc::EnableMedia(dependencies);
 
   if (c->config_.configure_dependencies) {
     c->config_.configure_dependencies(dependencies);