diff --git a/control_dbus.c b/control_dbus.c
index 322c7434b0234ee40c16c8428b24d1153abd001a..4fb9e33486e27bd5c0cb4f8c5037fd8e9fb19520 100644
--- a/control_dbus.c
+++ b/control_dbus.c
@@ -43,7 +43,9 @@ static int control_dbus_directive(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int control_dbus_ping(sd_bus_message *m, void *userdata,
@@ -190,7 +192,9 @@ static int control_dbus_set_backend(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int control_dbus_get_u8(sd_bus *bus, const char *path,
diff --git a/control_legacy.c b/control_legacy.c
index 3e9a6dff12a3e9117914859ae8ffb0a7cd2152d3..2a3461dc0b36f106e0740c042a9cbb12978ded0d 100644
--- a/control_legacy.c
+++ b/control_legacy.c
@@ -278,6 +278,7 @@ out:
 	}
 
 	rc = sd_bus_send(NULL, n, NULL); /* Send response */
+	sd_bus_message_unref(n);
 	if (rc < 0)
 		MSG_ERR("sd_bus_send failed: %d\n", rc);
 
diff --git a/transport_dbus.c b/transport_dbus.c
index 42fb018b04e582f5bd6d1c0b88721917f0084620..b6eb0e1b477f969a956d17458d37283cf575f194 100644
--- a/transport_dbus.c
+++ b/transport_dbus.c
@@ -93,7 +93,9 @@ static int transport_dbus_reset(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int transport_dbus_get_info(sd_bus_message *m, void *userdata,
@@ -146,7 +148,9 @@ static int transport_dbus_get_info(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int transport_dbus_get_flash_info(sd_bus_message *m, void *userdata,
@@ -181,7 +185,9 @@ static int transport_dbus_get_flash_info(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int transport_dbus_create_window(struct mbox_context *context,
@@ -225,7 +231,9 @@ static int transport_dbus_create_window(struct mbox_context *context,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int transport_dbus_create_read_window(sd_bus_message *m, void *userdata,
@@ -274,7 +282,9 @@ static int transport_dbus_close_window(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 
 }
 
@@ -308,7 +318,9 @@ static int transport_dbus_mark_dirty(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int transport_dbus_write_flush(sd_bus_message *m, void *userdata,
@@ -334,7 +346,9 @@ static int transport_dbus_write_flush(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int transport_dbus_ack(sd_bus_message *m, void *userdata,
@@ -367,7 +381,9 @@ static int transport_dbus_ack(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int transport_dbus_erase(sd_bus_message *m, void *userdata,
@@ -400,7 +416,9 @@ static int transport_dbus_erase(sd_bus_message *m, void *userdata,
 		return rc;
 	}
 
-	return sd_bus_send(NULL, n, NULL);
+	rc = sd_bus_send(NULL, n, NULL);
+	sd_bus_message_unref(n);
+	return rc;
 }
 
 static int transport_dbus_get_property(sd_bus *bus,