diff --git a/packages/common/src/chains/.goerli.json.swp b/packages/common/src/chains/.goerli.json.swp
new file mode 100644
index 0000000000..fe24440c05
Binary files /dev/null and b/packages/common/src/chains/.goerli.json.swp differ
diff --git a/packages/common/src/chains/index.ts b/packages/common/src/chains/index.ts
index faf1b2edfd..d0771a6ff3 100644
--- a/packages/common/src/chains/index.ts
+++ b/packages/common/src/chains/index.ts
@@ -6,7 +6,7 @@ export const chains: chainsType = {
     '3': 'ropsten',
     '4': 'rinkeby',
     '42': 'kovan',
-    '6284': 'goerli',
+    '5': 'goerli',
   },
   mainnet: require('./mainnet.json'),
   ropsten: require('./ropsten.json'),
diff --git a/packages/common/src/genesisStates/index.ts b/packages/common/src/genesisStates/index.ts
index ab4080ca8d..31f80a2309 100644
--- a/packages/common/src/genesisStates/index.ts
+++ b/packages/common/src/genesisStates/index.ts
@@ -6,7 +6,7 @@ const genesisStates: genesisStatesType = {
     '3': 'ropsten',
     '4': 'rinkeby',
     '42': 'kovan',
-    '6284': 'goerli',
+    '5': 'goerli',
   },
   mainnet: require('./mainnet.json'),
   ropsten: require('./ropsten.json'),
diff --git a/packages/common/tests/genesisStates.ts b/packages/common/tests/genesisStates.ts
index c63001c81a..4bb34da490 100644
--- a/packages/common/tests/genesisStates.ts
+++ b/packages/common/tests/genesisStates.ts
@@ -3,7 +3,7 @@ import { genesisStateById, genesisStateByName } from '../src/genesisStates/'
 
 tape('[genesisStates]: Genesis state access', function (t: tape.Test) {
   t.test('Should be able to access by ID and name', function (st: tape.Test) {
-    let genesisState = genesisStateById(6284)
+    let genesisState = genesisStateById(5)
     st.equal(
       genesisState['0x0000000000000000000000000000000000000008'],
       '0x1',