diff --git a/obexd/client/session.c b/obexd/client/session.c
index 817f950..b156849 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -99,6 +99,9 @@ static void session_unref(struct session_data *session)
 	if (session->agent_watch)
 		g_dbus_remove_watch(session->conn, session->agent_watch);
 
+	if (session->owner_watch)
+		g_dbus_remove_watch(session->conn, session->owner_watch);
+
 	if (session->agent_name != NULL) {
 		DBusMessage *message;
 
@@ -803,8 +806,6 @@ static DBusMessage *close_session(DBusConnection *connection,
 				"org.openobex.Error.NotAuthorized",
 				"Not Authorized");
 
-	g_dbus_remove_watch(session->conn, session->owner_watch);
-
 	session_shutdown(session);
 
 	return dbus_message_new_method_return(message);