diff --git a/sdk/keyvault/azure-keyvault-secrets/HISTORY.md b/sdk/keyvault/azure-keyvault-secrets/HISTORY.md
index f5a9864a7a98..5805d539d570 100644
--- a/sdk/keyvault/azure-keyvault-secrets/HISTORY.md
+++ b/sdk/keyvault/azure-keyvault-secrets/HISTORY.md
@@ -1,4 +1,9 @@
 # Release History
+
+## 4.0.0b4
+### Fixes and improvements
+- `list_secrets` and `list_secret_versions` return the correct type
+
 ## 4.0.0b3 (2019-09-11)
 This release includes only internal changes.
 
diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/client.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/client.py
index 3170d8949e5c..d2c9fbbe0834 100644
--- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/client.py
+++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/client.py
@@ -188,7 +188,7 @@ def list_secrets(self, **kwargs):
         return self._client.get_secrets(
             self._vault_url,
             maxresults=max_page_size,
-            cls=lambda objs: [DeletedSecret._from_secret_item(x) for x in objs],
+            cls=lambda objs: [SecretAttributes._from_secret_item(x) for x in objs],
             **kwargs
         )
 
@@ -216,7 +216,7 @@ def list_secret_versions(self, name, **kwargs):
             self._vault_url,
             name,
             maxresults=max_page_size,
-            cls=lambda objs: [DeletedSecret._from_secret_item(x) for x in objs],
+            cls=lambda objs: [SecretAttributes._from_secret_item(x) for x in objs],
             **kwargs
         )