diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 848418fc5..626ab3332 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -69,7 +69,7 @@ import {
   AddressBookController,
   CurrencyRateController,
   PhishingController,
-} from 'gaba'
+} from '@metamask/controllers'
 
 import backEndMetaMetricsEvent from './lib/backend-metametrics'
 
diff --git a/app/scripts/migrations/037.js b/app/scripts/migrations/037.js
index 6ca313acd..42287af4f 100644
--- a/app/scripts/migrations/037.js
+++ b/app/scripts/migrations/037.js
@@ -1,6 +1,6 @@
 const version = 37
 import { cloneDeep } from 'lodash'
-import { util } from 'gaba'
+import { util } from '@metamask/controllers'
 
 /**
  * The purpose of this migration is to update the address book state
diff --git a/package.json b/package.json
index 5d8622c13..e68a621af 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
     "@download/blockies": "^1.0.3",
     "@fortawesome/fontawesome-free": "^5.13.0",
     "@material-ui/core": "1.0.0",
+    "@metamask/controllers": "^2.0.0",
     "@metamask/eth-ledger-bridge-keyring": "^0.2.6",
     "@metamask/eth-token-tracker": "^2.0.0",
     "@metamask/etherscan-link": "^1.1.0",
@@ -123,7 +124,6 @@
     "extensionizer": "^1.0.1",
     "fast-json-patch": "^2.0.4",
     "fuse.js": "^3.2.0",
-    "gaba": "^1.11.0",
     "human-standard-token-abi": "^2.0.0",
     "jazzicon": "^2.0.0",
     "json-rpc-engine": "^5.1.8",
diff --git a/yarn.lock b/yarn.lock
index 88ebb9fb5..262c67bcc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1849,6 +1849,34 @@
     scroll "^2.0.3"
     warning "^3.0.0"
 
+"@metamask/controllers@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-2.0.0.tgz#e57762c213d2722fd178d4c5c288ad98a2ee8bdf"
+  integrity sha512-J2DSoyyPRAilTdohl43O5tZdqOSMvB94Kx1ApRpkPZxQwtDUIzWHRpTXptyCEwkhaOdkNz9BvWMoaRQxjktfKw==
+  dependencies:
+    await-semaphore "^0.1.3"
+    eth-contract-metadata "^1.11.0"
+    eth-ens-namehash "^2.0.8"
+    eth-json-rpc-errors "^2.0.2"
+    eth-json-rpc-infura "^4.0.1"
+    eth-keyring-controller "^5.6.1"
+    eth-method-registry "1.1.0"
+    eth-phishing-detect "^1.1.13"
+    eth-query "^2.1.2"
+    eth-sig-util "^2.3.0"
+    ethereumjs-util "^6.1.0"
+    ethereumjs-wallet "0.6.0"
+    ethjs-query "^0.3.8"
+    human-standard-collectible-abi "^1.0.2"
+    human-standard-token-abi "^2.0.0"
+    isomorphic-fetch "^2.2.1"
+    jsonschema "^1.2.4"
+    percentile "^1.2.1"
+    single-call-balance-checker-abi "^1.0.0"
+    uuid "^3.3.2"
+    web3 "^0.20.7"
+    web3-provider-engine "^15.0.4"
+
 "@metamask/eslint-config@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@metamask/eslint-config/-/eslint-config-1.1.0.tgz#03c6fbec8ba3d95fa017d8b98ab5d0701f7458a4"
@@ -12554,7 +12582,7 @@ fuse.js@^3.4.6:
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.6.tgz#545c3411fed88bf2e27c457cab6e73e7af697a45"
   integrity sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg==
 
-gaba@^1.11.0, gaba@^1.9.3:
+gaba@^1.9.3:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/gaba/-/gaba-1.11.0.tgz#7ff49cad2f2b95941222121a1984bb63783fe076"
   integrity sha512-rQcLgR/FHQ8W6oNza/vxFnkbav0vgauBxm6LKqK6BkbjJGB979qoBRVja9fU/H5dUMiYmHJO9CrHjL0ofG/ukA==