diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index cc99235..8ba906d 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -132,7 +132,8 @@
 		  (&optional refresh))
 (declare-function org-publish-get-project-from-filename "org-publish"
 		  (filename &optional up))
-(declare-function server-delete-client proc "server" (&optional noframe))
+(declare-function server-sentinel "server"
+		  (proc msg))
 
 (defgroup org-protocol nil
   "Intercept calls from emacsclient to trigger custom actions.
@@ -478,7 +479,7 @@ as filename."
                        (splitted (split-string fname proto))
                        (result (if greedy restoffiles (cadr splitted))))
                   (if (plist-get (cdr prolist) :kill-client)
-                      (server-delete-client client t))
+		      (server-sentinel client "Greedy org-protocol handler. Killing client."))
                   (when (fboundp func)
                     (unless greedy
                       (throw 'fname (funcall func result)))