diff --git a/src/ray/gcs/redis_gcs_client.cc b/src/ray/gcs/redis_gcs_client.cc
index ef5c507cf..46e2f7c79 100644
--- a/src/ray/gcs/redis_gcs_client.cc
+++ b/src/ray/gcs/redis_gcs_client.cc
@@ -69,7 +69,12 @@ Status RedisGcsClient::Connect(boost::asio::io_service &io_service) {
   actor_checkpoint_id_table_.reset(new ActorCheckpointIdTable(shard_contexts, this));
   resource_table_.reset(new DynamicResourceTable({primary_context}, this));
   worker_failure_table_.reset(new WorkerFailureTable(shard_contexts, this));
-  actor_accessor_.reset(new RedisActorInfoAccessor(this));
+
+  if (RayConfig::instance().gcs_actor_service_enabled()) {
+    actor_accessor_.reset(new RedisActorInfoAccessor(this));
+  } else {
+    actor_accessor_.reset(new RedisLogBasedActorInfoAccessor(this));
+  }
   job_accessor_.reset(new RedisJobInfoAccessor(this));
   object_accessor_.reset(new RedisObjectInfoAccessor(this));
   node_accessor_.reset(new RedisNodeInfoAccessor(this));