diff --git a/lib/passwordstate/resources/folder.rb b/lib/passwordstate/resources/folder.rb
index 07b51892e7710c6273a2aa60935b8f92e7c4c40d..1fe3c0106f8ab10bf96960baa10b9c995f318c00 100644
--- a/lib/passwordstate/resources/folder.rb
+++ b/lib/passwordstate/resources/folder.rb
@@ -16,7 +16,8 @@ module Passwordstate
       alias title folder_name
 
       def password_lists
-        Passwordstate::ResourceList.new client, Passwordstate::Resources::PasswordList,
+        Passwordstate::ResourceList.new Passwordstate::Resources::PasswordList,
+                                        client: client,
                                         search_query: { tree_path: tree_path },
                                         all_path: 'searchpasswordlists',
                                         all_query: { tree_path: tree_path },
diff --git a/lib/passwordstate/resources/password.rb b/lib/passwordstate/resources/password.rb
index 3984a2f64ac11833828a28fd5be37060cf769f99..5c51cd0ad6eca87e2b7256e181aa2e044ea9b0e8 100644
--- a/lib/passwordstate/resources/password.rb
+++ b/lib/passwordstate/resources/password.rb
@@ -58,7 +58,8 @@ module Passwordstate
       def history
         raise 'Password history only available on stored passwords' unless stored?
 
-        Passwordstate::ResourceList.new client, PasswordHistory,
+        Passwordstate::ResourceList.new PasswordHistory,
+                                        client: client,
                                         all_path: "passwordhistory/#{password_id}",
                                         only: :all
       end
diff --git a/lib/passwordstate/resources/password_list.rb b/lib/passwordstate/resources/password_list.rb
index 1ddc120a080e79a4377eaa8a3bea3031159781fc..9c880f9953bf7a9da1ae284f84efc48f3df20f08 100644
--- a/lib/passwordstate/resources/password_list.rb
+++ b/lib/passwordstate/resources/password_list.rb
@@ -45,7 +45,8 @@ module Passwordstate
       end
 
       def passwords
-        Passwordstate::ResourceList.new client, Passwordstate::Resources::Password,
+        Passwordstate::ResourceList.new Passwordstate::Resources::Password,
+                                        client: client,
                                         all_path: "passwords/#{password_list_id}",
                                         all_query: { query_all: nil },
                                         search_path: "searchpasswords/#{password_list_id}",