diff --git a/core/function.go b/core/function.go
index 42c1fed..327c252 100644
--- a/core/function.go
+++ b/core/function.go
@@ -100,8 +100,8 @@ func handleMessage(sender Sender) {
 				rt := function.Handle(sender)
 				if rt != nil {
 					sender.Reply(rt)
-					sender.Finish()
 				}
+				sender.Finish()
 				return
 			}
 		}