diff --git a/app/services/kredits.js b/app/services/kredits.js
index e5e999e..1e565cc 100644
--- a/app/services/kredits.js
+++ b/app/services/kredits.js
@@ -5,9 +5,16 @@ import Contributor from 'kredits-web/models/contributor';
 import Proposal from 'kredits-web/models/proposal';
 import kreditsContracts from 'npm:kredits-contracts';
 
+const {
+  isPresent,
+  inject: {
+    service
+  }
+} = Ember;
+
 export default Ember.Service.extend({
 
-  ipfs: Ember.inject.service(),
+  ipfs: service(),
 
   web3Instance: null,
   web3Provided: false, // Web3 provided (using Mist Browser, Metamask et al.)
@@ -43,8 +50,13 @@ export default Ember.Service.extend({
     if (this.get('kreditsContractInstance')) {
       return this.get('kreditsContractInstance');
     }
+    let contract;
 
-    let contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Kredits'];
+    if (isPresent(config.contractMetadata)) {
+      contract = kreditsContracts(this.get('web3'), config.contractMetadata)['Kredits'];
+    } else {
+      contract = kreditsContracts(this.get('web3'))['Kredits'];
+    }
 
     this.set('kreditsContractInstance', contract);
     window.Kredits = contract;
diff --git a/package.json b/package.json
index 187496e..7971fc7 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "ember-parachute": "0.1.0",
     "ember-resolver": "^2.0.3",
     "ipfs-api": "^12.1.7",
-    "kredits-contracts": "^2.0.4",
+    "kredits-contracts": "^2.4.0",
     "loader.js": "^4.0.10",
     "web3": "^0.18.2"
   },