diff --git a/plugins/modules/server_info.py b/plugins/modules/server_info.py
index 6ab87952..2a17b411 100644
--- a/plugins/modules/server_info.py
+++ b/plugins/modules/server_info.py
@@ -377,7 +377,9 @@ class ServerInfoModule(OpenStackModule):
         kwargs['name_or_id'] = self.params['name']
 
         self.exit(changed=False,
-                  servers=[server.to_dict(computed=False) for server in
+                  servers=[server.to_dict(computed=False)
+                           if hasattr(server, "to_dict") else server
+                           for server in
                            self.conn.search_servers(**kwargs)])