diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index f803d40413ac..ac3be2fceade 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -660,6 +660,9 @@ void gb_connection_destroy(struct gb_connection *connection)
 	if (!connection)
 		return;
 
+	if (WARN_ON(connection->state != GB_CONNECTION_STATE_DISABLED))
+		gb_connection_disable(connection);
+
 	mutex_lock(&gb_connection_mutex);
 
 	spin_lock_irq(&gb_connections_lock);