diff --git a/core/src/main/groovy/com/muwire/core/search/SearchManager.groovy b/core/src/main/groovy/com/muwire/core/search/SearchManager.groovy
index 0203e9eb..9c230024 100644
--- a/core/src/main/groovy/com/muwire/core/search/SearchManager.groovy
+++ b/core/src/main/groovy/com/muwire/core/search/SearchManager.groovy
@@ -40,6 +40,12 @@ public class SearchManager {
             return
         }
         responderAddress.put(event.searchEvent.uuid, event)
+        
+        if (event.searchEvent.regex) {
+            log.info("dropping regex query")
+            return
+        }
+        
         eventBus.publish(event.searchEvent)
     }