diff --git a/lib/rubotnik.rb b/lib/rubotnik.rb
index <HASH>..<HASH> 100644
--- a/lib/rubotnik.rb
+++ b/lib/rubotnik.rb
@@ -23,15 +23,17 @@ module Rubotnik
   end
 
   def self.route(event, &block)
-    return Bot.on(event, &block) unless [:message, :postback].include?(event)
-
-    Bot.on event do |e|
-      case e
-      when Facebook::Messenger::Incoming::Message
-        Rubotnik::MessageDispatch.new(e).route(&block)
-      when Facebook::Messenger::Incoming::Postback
-        Rubotnik::PostbackDispatch.new(e).route(&block)
+    if [:message, :postback].include?(event)
+      Bot.on event do |e|
+        case e
+        when Facebook::Messenger::Incoming::Message
+          Rubotnik::MessageDispatch.new(e).route(&block)
+        when Facebook::Messenger::Incoming::Postback
+          Rubotnik::PostbackDispatch.new(e).route(&block)
+        end
       end
+    else
+      Bot.on(event, &block)
     end
   end
Change return to if/else