diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index bed819b..229bf3b 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -93,7 +93,7 @@ jobs:
       matrix:
         build: [
           {runs-on: n150, name: "run"},
-          # {runs-on: n300, name: "run"}, #TODO: https://github.com/tenstorrent/tt-xla/issues/9
+          {runs-on: n300, name: "run"},
         ]
 
     runs-on:
diff --git a/src/common/api_impl.cc b/src/common/api_impl.cc
index b6ae204..3d31602 100644
--- a/src/common/api_impl.cc
+++ b/src/common/api_impl.cc
@@ -646,7 +646,7 @@ void ClientInstance::BindApi(PJRT_Api* api) {
 tt_pjrt_status ClientInstance::PopulateDevices() {
   DLOG_F(LOG_DEBUG, "ClientInstance::PopulateDevices");
   auto [system_desc, chip_ids] = tt::runtime::getCurrentSystemDesc();
-  int device_info_count_ = chip_ids.size();
+  int device_info_count_ = 1; // TODO: revert to chip_ids.size(); once https://github.com/tenstorrent/tt-xla/issues/9 is fixed
 
   devices_.resize(device_info_count_);
   for (size_t i = 0; i < device_info_count_; ++i) {