diff --git a/lib/fog/aws/models/compute/spot_requests.rb b/lib/fog/aws/models/compute/spot_requests.rb
index d2281b3e2..aa95038a5 100644
--- a/lib/fog/aws/models/compute/spot_requests.rb
+++ b/lib/fog/aws/models/compute/spot_requests.rb
@@ -62,10 +62,11 @@ module Fog
 
           spot_request.save
           spot_request.wait_for { ready? }
+          Fog.wait_for { server = connection.servers.get(spot_request.instance_id) }
           server = connection.servers.get(spot_request.instance_id)
           server.wait_for { ready? }
           server.setup(:key_data => [server.private_key])
-          spot_request
+          server
         end
 
         def get(spot_request_id)