diff --git a/src/requirements.txt b/src/requirements.txt
index 20769c39..7468b477 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -13,7 +13,7 @@ git+https://github.com/hubmapconsortium/portal-visualization.git@0.2.5#egg=porta
 # Use the branch name of commons from github for testing new changes made in commons from different branch
 # Default is main branch specified in search-api's docker-compose.development.yml if not set
 # git+https://github.com/hubmapconsortium/commons.git@${COMMONS_BRANCH}#egg=hubmap-commons
-hubmap-commons==2.1.17
+hubmap-commons==2.1.18
 
 # The use of `-r` lets us specify the transitive requirements in one place
 -r search-adaptor/src/requirements.txt
diff --git a/src/search-adaptor b/src/search-adaptor
index 5980cb96..8532e2f1 160000
--- a/src/search-adaptor
+++ b/src/search-adaptor
@@ -1 +1 @@
-Subproject commit 5980cb96a85509c398d1d46504d3b8ffb67a4f7b
+Subproject commit 8532e2f19859d5725bfc3e486e0ebe5cdc5eff0b