diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index f60d6cedf6..122af0aba6 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -874,6 +874,9 @@ request_secrets_from_ui (RequestData *request)
 	} else
 		goto out_fail;
 
+	if (secrets->len == 0)
+		goto out_fail;
+
 	g_signal_emit (request->self, signals[REQUEST_SECRETS], 0,
 	               request->request_id, title, msg, secrets);
 	return;