diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java
index 10cc70c23..f620ad9ff 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Keys.java
@@ -21,6 +21,7 @@ import org.whispersystems.textsecuregcm.storage.mappers.KeyRecordRowMapper;
 import org.whispersystems.textsecuregcm.util.Constants;
 
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -74,7 +75,7 @@ public class Keys {
   }
 
   public List<KeyRecord> get(String number, long deviceId) {
-    try {
+    /* try {
       return database.with(jdbi -> jdbi.inTransaction(TransactionIsolationLevel.SERIALIZABLE, handle -> {
         try (Timer.Context ignored = getDevicetTimer.time()) {
           return handle.createQuery("DELETE FROM keys WHERE id IN (SELECT id FROM keys WHERE number = :number AND device_id = :device_id ORDER BY key_id ASC LIMIT 1) RETURNING *")
@@ -88,11 +89,14 @@ public class Keys {
       // TODO 2021-01-13 Replace this with a retry once desktop clients better handle HTTP/500 responses
       fallbackMeter.mark();
       return Collections.emptyList();
-    }
+    } */
+
+    // 2021-01-15 Emergency service recovery measure
+    return new LinkedList<>();
   }
 
   public List<KeyRecord> get(String number) {
-    try {
+    /* try {
       return database.with(jdbi -> jdbi.inTransaction(TransactionIsolationLevel.SERIALIZABLE, handle -> {
         try (Timer.Context ignored = getTimer.time()) {
           return handle.createQuery("DELETE FROM keys WHERE id IN (SELECT DISTINCT ON (number, device_id) id FROM keys WHERE number = :number ORDER BY number, device_id, key_id ASC) RETURNING *")
@@ -105,7 +109,10 @@ public class Keys {
       // TODO 2021-01-13 Replace this with a retry once desktop clients better handle HTTP/500 responses
       fallbackMeter.mark();
       return Collections.emptyList();
-    }
+    } */
+
+    // 2021-01-15 Emergency service recovery measure
+    return new LinkedList<>();
   }
 
   public int getCount(String number, long deviceId) {
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/KeysTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/KeysTest.java
index 5db14741e..f9f5f30e1 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/KeysTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/KeysTest.java
@@ -17,6 +17,7 @@ import org.jdbi.v3.core.transaction.SerializableTransactionRunner;
 import org.jdbi.v3.core.transaction.TransactionException;
 import org.jdbi.v3.core.transaction.TransactionIsolationLevel;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
@@ -40,6 +41,7 @@ import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@Ignore
 public class KeysTest {
 
   @Rule