diff --git a/lib/telegraf.service.ts b/lib/telegraf.service.ts
index f927acb..5ba6e8a 100644
--- a/lib/telegraf.service.ts
+++ b/lib/telegraf.service.ts
@@ -109,10 +109,16 @@ export class TelegrafService {
   }
 
   private setupOnMessage(handlers: Handler[]): void {
-    const onMessageHandlers = handlers.filter(({ config }) => config.message)
+    const onMessageHandlers = handlers.filter(
+      ({ config }) => config.message !== undefined
+    )
 
     onMessageHandlers.forEach(handler => {
-      this.bot.hears(handler.config.message, this.adoptHandle(handler))
+      if (handler.config.message) {
+        this.bot.hears(handler.config.message, this.adoptHandle(handler))
+      } else {
+        this.bot.on('message', this.adoptHandle(handler))
+      }
     })
   }