diff --git a/src/app/components/plugin-manager-proxy.js b/src/app/components/plugin-manager-proxy.js
index 6fd2828590..64c5cc9794 100644
--- a/src/app/components/plugin-manager-proxy.js
+++ b/src/app/components/plugin-manager-proxy.js
@@ -10,7 +10,7 @@ class PluginManagerProxy {
     this.event = new EventManager()
     this._listeners = {}
     this._listeners['vyper'] = (data) => {
-      registry.get('compilersartefacts').api['__last'] = new CompilerAbstract(data.language, data, data.content)
+      registry.get('compilersartefacts').api['__last'] = new CompilerAbstract(data.language, data.result, data.content)
       this.event.trigger('sendCompilationResult', [data.title, data.content, data.language, data.result])
     }
     this._listeners['solidity'] = (file, source, languageVersion, data) => {
diff --git a/src/app/staticanalysis/staticAnalysisView.js b/src/app/staticanalysis/staticAnalysisView.js
index 12b8e352c0..e00676a4ea 100644
--- a/src/app/staticanalysis/staticAnalysisView.js
+++ b/src/app/staticanalysis/staticAnalysisView.js
@@ -27,10 +27,10 @@ function staticAnalysisView (localRegistry) {
   }
 
   self._deps.pluginManager.event.register('sendCompilationResult', (file, source, languageVersion, data) => {
-    if (languageVersion.indexOf('soljson') !== 0) return
     self.lastCompilationResult = null
     self.lastCompilationSource = null
     $('#staticanalysisresult').empty()
+    if (languageVersion.indexOf('soljson') !== 0) return
     self.lastCompilationResult = data
     self.lastCompilationSource = source
     if (self.view.querySelector('#autorunstaticanalysis').checked) {