diff --git a/src/app/debugger/debugger/debugger.js b/src/app/debugger/debugger/debugger.js
index b96b094955..f0b6b3086e 100644
--- a/src/app/debugger/debugger/debugger.js
+++ b/src/app/debugger/debugger/debugger.js
@@ -85,6 +85,8 @@ Debugger.prototype.debug = function (blockNumber, txNumber, tx, loadingCb) {
     return
   }
 
+  self.debugger.solidityProxy.reset({})
+
   if (tx) {
     if (!tx.to) {
       tx.to = traceHelper.contractCreationToken('0')
diff --git a/src/app/debugger/debuggerUI.js b/src/app/debugger/debuggerUI.js
index 5b21b8c6e7..5b2004d4d0 100644
--- a/src/app/debugger/debuggerUI.js
+++ b/src/app/debugger/debuggerUI.js
@@ -121,22 +121,7 @@ class DebuggerUI {
   }
 
   debug (txHash) {
-    const self = this
-    let web3 = executionContext.web3()
-    web3.eth.getTransaction(txHash, (error, tx) => {
-      if (error) {
-        return console.error("coudn't get txHash: " + error)
-      }
-      self.transactionDebugger.debugger.solidityProxy.reset({})
-
-      if (tx instanceof Object) {
-        self.txBrowser.load(tx.hash, tx)
-        self.startDebugging(null, tx.hash, tx)
-      } else if (tx instanceof String) {
-        self.txBrowser.load(tx)
-        self.startDebugging(null, tx)
-      }
-    })
+    this.startDebugging(null, txHash, null)
   }
 
   render () {