diff --git a/packages/app-contracts/src/Codes/Upload.tsx b/packages/app-contracts/src/Codes/Upload.tsx
index 984b0f398c..d66923a455 100644
--- a/packages/app-contracts/src/Codes/Upload.tsx
+++ b/packages/app-contracts/src/Codes/Upload.tsx
@@ -96,9 +96,11 @@ class Upload extends ContractModal<Props, State> {
   }
 
   private onSuccess = (result: SubmittableResult): void => {
+    const { api } = this.props;
     this.setState(({ abi, name, tags }) => {
 
-      const record = result.findRecord('contract', 'CodeStored');
+      const section = api.tx.contracts ? 'contracts' : 'contract';
+      const record = result.findRecord(section, 'CodeStored');
 
       if (record) {
         const codeHash = record.event.data[0];
diff --git a/packages/app-contracts/src/Deploy.tsx b/packages/app-contracts/src/Deploy.tsx
index e2d696a4e3..8fb81c94e3 100644
--- a/packages/app-contracts/src/Deploy.tsx
+++ b/packages/app-contracts/src/Deploy.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
 import { Abi } from '@polkadot/api-contract';
-import { api, withApi, withMulti } from '@polkadot/ui-api';
+import { api as apiUi, withApi, withMulti } from '@polkadot/ui-api';
 import keyring from '@polkadot/ui-keyring';
 import { Button, Dropdown, InputBalance, TxButton } from '@polkadot/ui-app';
 import { AccountId, getTypeDef } from '@polkadot/types';
@@ -248,14 +248,15 @@ class Deploy extends ContractModal<Props, State> {
   }
 
   private onSuccess = async (result: SubmittableResult) => {
-    const { history } = this.props;
+    const { api, history } = this.props;
 
-    const record = result.findRecord('contract', 'Instantiated');
+    const section = api.tx.contracts ? 'contracts' : 'contract';
+    const record = result.findRecord(section, 'Instantiated');
 
     if (record) {
       const address = record.event.data[1] as any as AccountId;
 
-      await api.isReady;
+      await apiUi.isReady;
 
       this.setState(({ abi, name, tags }) => {
         if (!abi || !name) {
@@ -266,7 +267,7 @@ class Deploy extends ContractModal<Props, State> {
           name,
           contract: {
             abi,
-            genesisHash: api.genesisHash.toHex()
+            genesisHash: apiUi.genesisHash.toHex()
           },
           tags
         });