diff --git a/dreadnode/api/client.py b/dreadnode/api/client.py
index bc69457f..9de1ee8a 100644
--- a/dreadnode/api/client.py
+++ b/dreadnode/api/client.py
@@ -750,14 +750,17 @@ def export_timeseries(
 
     # User data access
 
-    def get_user_data_credentials(self) -> UserDataCredentials:
+    def get_user_data_credentials(
+        self, organization_id: UUID, workspace_id: UUID
+    ) -> UserDataCredentials:
         """
         Retrieves user data credentials for secondary storage access.
 
         Returns:
             The user data credentials object.
         """
-        response = self._request("GET", "/user-data/credentials")
+        params = {"org_id": str(organization_id), "workspace_id": str(workspace_id)}
+        response = self._request("GET", "/user-data/credentials", params=params)
         return UserDataCredentials(**response.json())
 
     # Container registry access
diff --git a/dreadnode/main.py b/dreadnode/main.py
index eb65f752..a9ee3e11 100644
--- a/dreadnode/main.py
+++ b/dreadnode/main.py
@@ -688,8 +688,11 @@ def initialize(self) -> None:
             if self._api is not None:
                 api = self._api
                 self._credential_manager = CredentialManager(
-                    credential_fetcher=lambda: api.get_user_data_credentials()
+                    credential_fetcher=lambda: api.get_user_data_credentials(
+                        self._organization.id, self._workspace.id
+                    )
                 )
+
                 self._credential_manager.initialize()
 
                 self._fs = self._credential_manager.get_filesystem()