diff --git a/lib/fake_dynamo/table.rb b/lib/fake_dynamo/table.rb
index <HASH>..<HASH> 100644
--- a/lib/fake_dynamo/table.rb
+++ b/lib/fake_dynamo/table.rb
@@ -250,7 +250,11 @@ module FakeDynamo
       merge_items(response, data, results, index)
 
       if last_evaluated_item
-        response['LastEvaluatedKey'] = last_evaluated_item.key.as_hash
+        if index
+          response['LastEvaluatedKey'] = Key.from_index_item(last_evaluated_item, schema).as_hash
+        else
+          response['LastEvaluatedKey'] = last_evaluated_item.key.as_hash
+        end
       end
       response
     end
fix LastEvaluatedKey on index lookups to have 3 fields