diff --git a/Gemfile b/Gemfile
index 6de67cc8..b4839573 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,10 @@ gemspec
 group :test do
   gem 'activejob'
   gem 'aws-sdk-core', '~> 3'
-  gem 'aws-sdk-sqs'
+  # Pin to 1.65.0 because of below issues:
+  # - https://github.com/ruby-shoryuken/shoryuken/pull/753#issuecomment-1822720647
+  # - https://github.com/getmoto/moto/issues/7054
+  gem 'aws-sdk-sqs', '1.65.0'
   gem 'codeclimate-test-reporter', require: nil
   gem 'httparty'
   gem 'multi_xml'
diff --git a/bin/cli/sqs.rb b/bin/cli/sqs.rb
index b4751fe9..f6c1ab2f 100644
--- a/bin/cli/sqs.rb
+++ b/bin/cli/sqs.rb
@@ -117,7 +117,7 @@ def find_all(url, limit)
               max_number_of_messages: batch_size,
               attribute_names: ['All'],
               message_attribute_names: ['All']
-            ).messages
+            ).messages || []
 
             messages.each { |m| yield m }
 
diff --git a/lib/shoryuken/queue.rb b/lib/shoryuken/queue.rb
index aeb2e82e..24a7aec2 100644
--- a/lib/shoryuken/queue.rb
+++ b/lib/shoryuken/queue.rb
@@ -43,7 +43,8 @@ def send_messages(options)
     end
 
     def receive_messages(options)
-      client.receive_message(options.merge(queue_url: url)).messages.map { |m| Message.new(client, self, m) }
+      messages = client.receive_message(options.merge(queue_url: url)).messages || []
+      messages.map { |m| Message.new(client, self, m) }
     end
 
     def fifo?