diff --git a/src/core/plugins/oas3/components/servers.jsx b/src/core/plugins/oas3/components/servers.jsx
index 37c3f386..94e8d019 100644
--- a/src/core/plugins/oas3/components/servers.jsx
+++ b/src/core/plugins/oas3/components/servers.jsx
@@ -104,13 +104,12 @@ export default class Servers extends React.Component {
     return (
       <div className="servers">
         <label htmlFor="servers">
-          <select onChange={ this.onServerChange }>
+          <select onChange={ this.onServerChange } value={currentServer}>
             { servers.valueSeq().map(
               ( server ) =>
               <option
                 value={ server.get("url") }
-                key={ server.get("url") }
-                selected={ currentServer === server.get("url") }>
+                key={ server.get("url") }>
                 { server.get("url") }
                 { server.get("description") && ` - ${server.get("description")}` }
               </option>
diff --git a/test/e2e-cypress/tests/bugs/6351.js b/test/e2e-cypress/tests/bugs/6351.js
index 63c37b71..e1113b46 100644
--- a/test/e2e-cypress/tests/bugs/6351.js
+++ b/test/e2e-cypress/tests/bugs/6351.js
@@ -3,11 +3,9 @@
 describe("#6351: Server dropdown should change when switched via oas3Actions.setSelectedServer", () => {
   it("should show different selected server", () => {
     cy.visit("/?url=/documents/bugs/6351.yaml")
-      .get("select")
-      .contains("http://testserver1.com")
+      .get("select").should("have.value", "http://testserver1.com")
       .window()
       .then(win => win.ui.oas3Actions.setSelectedServer("http://testserver2.com"))
-      .get("select")
-      .contains("http://testserver2.com")
+      .get("select").should("have.value", "http://testserver2.com")
   })
 })