diff --git a/lib/fog/aws/requests/rds/describe_db_instances.rb b/lib/fog/aws/requests/rds/describe_db_instances.rb
index 7e1f0a63b..d0522048b 100644
--- a/lib/fog/aws/requests/rds/describe_db_instances.rb
+++ b/lib/fog/aws/requests/rds/describe_db_instances.rb
@@ -40,9 +40,10 @@ module Fog
               server_set << server
             else
               raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found")
-            end 
+            end
+          else
+            server_set = self.data[:servers].values
           end
-          server_set = self.data[:servers].values
           
           server_set.each do |server|
              case server["DBInstanceStatus"]