diff --git a/lib/commands/general.js b/lib/commands/general.js
index 97947c2d..c1ea0d9a 100644
--- a/lib/commands/general.js
+++ b/lib/commands/general.js
@@ -322,11 +322,14 @@ commands.mobileClickAction = async function mobileClickAction (opts = {}) {
 };
 
 commands.updateSettings = async function updateSettings (settings) {
-  return await this.espresso.jwproxy.command(`/appium/settings`, 'POST', { settings });
+  await this.settings.update(settings);
+  await this.espresso.jwproxy.command(`/appium/settings`, 'POST', { settings });
 };
 
 commands.getSettings = async function getSettings () {
-  return await this.espresso.jwproxy.command(`/appium/settings`, 'GET');
+  const driverSettings = this.settings.getSettings();
+  const serverSettings = await this.espresso.jwproxy.command(`/appium/settings`, 'GET');
+  return {...driverSettings, ...serverSettings};
 };
 
 // Stop proxying to any Chromedriver and redirect to Espresso