diff --git a/api/Makefile b/api/Makefile
index 5bf4b73e5a9..1f194d3e660 100644
--- a/api/Makefile
+++ b/api/Makefile
@@ -5,7 +5,7 @@ SHELL := /bin/bash
 .PHONY: test docs publish clean install exe dev
 
 install:
-	python setup.py install && pip install -r requirements.txt
+	pip install -r requirements.txt && pip install -e .
 
 test:
 	python -m pylama opentrons tests && python -m pytest \
diff --git a/app/ui/robot/api-client/client.js b/app/ui/robot/api-client/client.js
index b7f131ae174..715f87ae238 100644
--- a/app/ui/robot/api-client/client.js
+++ b/app/ui/robot/api-client/client.js
@@ -63,7 +63,7 @@ export default function client (dispatch) {
           .on('notification', handleRobotNotification)
           .on('error', handleClientError)
 
-        sessionManager = rpcClient.remote
+        sessionManager = rpcClient.remote.session_manager
         session = sessionManager.session
         robot = sessionManager.robot
 
diff --git a/app/ui/robot/test/api-client.test.js b/app/ui/robot/test/api-client.test.js
index a3219a45c17..1204afc9bd4 100644
--- a/app/ui/robot/test/api-client.test.js
+++ b/app/ui/robot/test/api-client.test.js
@@ -47,7 +47,9 @@ describe('api client', () => {
     rpcClient = {
       on: jest.fn(() => rpcClient),
       close: jest.fn(),
-      remote: sessionManager
+      remote: {
+        session_manager: sessionManager
+      }
     }
 
     dispatch = jest.fn()