diff --git a/lib/passwordstate/resource_list.rb b/lib/passwordstate/resource_list.rb
index 255b2a47904876e780c25e7f7962ffd7e9072df1..2727b691c7d6b5c6d54f2a11e86078196b672ea9 100644
--- a/lib/passwordstate/resource_list.rb
+++ b/lib/passwordstate/resource_list.rb
@@ -95,7 +95,7 @@ module Passwordstate
     def get(id, query = {})
       raise 'Operation not supported' unless operation_supported?(:get)
 
-      if query.empty?
+      if query.empty? && !entries.empty?
         existing = entries.find do |entry|
           entry.send(entry.class.index_field) == id
         end