diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts
index 6e7b77c21e..5d1f35157c 100644
--- a/server/mongo/src/storage.ts
+++ b/server/mongo/src/storage.ts
@@ -38,7 +38,7 @@ abstract class MongoAdapterBase extends TxProcessor {
     const translated: any = {}
     for (const key in query) {
       const value = (query as any)[key]
-      if (typeof value === 'object') {
+      if (value !== null && typeof value === 'object') {
         const keys = Object.keys(value)
         if (keys[0] === '$like') {
           const pattern = value.$like as string