diff --git a/src/session_expiry.c b/src/session_expiry.c
index 01d3905e..841262c0 100644
--- a/src/session_expiry.c
+++ b/src/session_expiry.c
@@ -72,7 +72,7 @@ void session_expiry__remove_all(struct mosquitto_db *db)
 		session_expiry__remove(context);
 		context->session_expiry_interval = 0;
 		context->will_delay_interval = 0;
-		context__send_will(db, context);
+		context__disconnect(db, context);
 	}
 	
 }