diff --git a/src/components/ConnectForm.js b/src/components/ConnectForm.js
index a78fb21..34d7172 100644
--- a/src/components/ConnectForm.js
+++ b/src/components/ConnectForm.js
@@ -12,7 +12,7 @@ const ConnectForm = (props) => {
         return actions.socket.open(values.url, actions.socketHandlers);
     });
 
-    const isSocketClosed = socket.get("state") === STATE_CLOSED;
+    const isSocketClosed = socket.state === STATE_CLOSED;
 
     return (
         <div id="connect-form">
@@ -25,8 +25,8 @@ const ConnectForm = (props) => {
                 </button>
             </form>
             <SocketStatusPane
-                state={socket.get("state")}
-                url={socket.get("url")}
+                state={socket.state}
+                url={socket.url}
             />
         </div>
     );
@@ -35,7 +35,7 @@ const ConnectForm = (props) => {
 ConnectForm.propTypes = {
     fields:       PropTypes.object.isRequired,
     handleSubmit: PropTypes.func.isRequired,
-    socket:       ImmutablePropTypes.map.isRequired,
+    socket:       ImmutablePropTypes.record.isRequired,
     actions:      PropTypes.object.isRequired
 };
 
diff --git a/src/containers/ConnectPage.js b/src/containers/ConnectPage.js
index 876bb24..7a26fed 100644
--- a/src/containers/ConnectPage.js
+++ b/src/containers/ConnectPage.js
@@ -31,7 +31,7 @@ class ConnectPage extends React.Component {
 
     getLoginStatusOrRedirect(props) {
         const { actions, login, router, socket } = props;
-        if (socket.get("state") === STATE_OPEN)
+        if (socket.state === STATE_OPEN)
         {
             const loginStatus = login.get("status");
             switch (loginStatus) {
diff --git a/src/containers/Footer.js b/src/containers/Footer.js
index 506ac3c..a5a722b 100644
--- a/src/containers/Footer.js
+++ b/src/containers/Footer.js
@@ -9,8 +9,8 @@ const Footer = ({ login, socket }) => {
     return (
         <footer>
             <SocketStatusPane
-                state={socket.get("state")}
-                url={socket.get("url")}
+                state={socket.state}
+                url={socket.url}
             />
             <LoginStatusPane
                 status={login.get("status")}
@@ -24,7 +24,7 @@ const Footer = ({ login, socket }) => {
 
 Footer.propTypes = {
     login:  ImmutablePropTypes.map.isRequired,
-    socket: ImmutablePropTypes.map.isRequired
+    socket: ImmutablePropTypes.record.isRequired
 };
 
 const mapStateToProps = ({ socket, login }) => ({ socket, login });
diff --git a/src/createRoutes.js b/src/createRoutes.js
index aa17be7..fb13e12 100644
--- a/src/createRoutes.js
+++ b/src/createRoutes.js
@@ -13,7 +13,7 @@ import { LOGIN_STATUS_SUCCESS } from "./constants/login";
 const createRoutes = (store) => {
     const requireLoggedIn = (nextState, replaceState) => {
         let { socket, login } = store.getState();
-        if (socket.get("state") !== STATE_OPEN ||
+        if (socket.state !== STATE_OPEN ||
                 login.get("status") !== LOGIN_STATUS_SUCCESS)
         {
             replaceState({}, "/");
diff --git a/src/reducers/socket.js b/src/reducers/socket.js
index 8b38243..526f62e 100644
--- a/src/reducers/socket.js
+++ b/src/reducers/socket.js
@@ -7,14 +7,18 @@ import {
 
 import ControlRequest from "../utils/ControlRequest";
 
-const initialState = Immutable.Map({
-    state: STATE_CLOSED
+const SocketRecord = Immutable.Record({
+    state:  STATE_CLOSED,
+    socket: undefined,
+    url:    undefined
 });
 
+const initialState = new SocketRecord();
+
 export default (state = initialState, { type, payload }) => {
     const sendRequest = (controlRequest) => {
         try {
-            state.get("socket").send(JSON.stringify(controlRequest));
+            state.socket.send(JSON.stringify(controlRequest));
         } catch (err) {
             console.log(`Socket error: failed to send ${controlRequest}`);
         }
@@ -23,7 +27,7 @@ export default (state = initialState, { type, payload }) => {
     switch (type) {
         case types.SOCKET_SET_OPENING:
         {
-            if (state.get("state") !== STATE_CLOSED) {
+            if (state.state !== STATE_CLOSED) {
                 console.log("Cannot open socket, already open");
                 return state;
             }
@@ -46,7 +50,7 @@ export default (state = initialState, { type, payload }) => {
 
         case types.SOCKET_SET_CLOSING:
             // Ooh bad stateful reducing...
-            state.get("socket").close();
+            state.socket.close();
             return state.set("state", STATE_CLOSING);
 
         case types.SOCKET_SET_CLOSED:
@@ -54,7 +58,7 @@ export default (state = initialState, { type, payload }) => {
 
         case types.SOCKET_SET_ERROR:
             console.log("Socket error");
-            return state.set("state", state.get("socket").readyState);
+            return state.set("state", state.socket.readyState);
 
         case types.LOGIN_GET_STATUS:
             sendRequest(ControlRequest.loginStatus());