diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 3c64d044ae81ecef6174204522108d9772524db6..8c472f823bd602837b7bcfa25f3e7aa1e8753e23 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import nls = require('vs/nls');
+import strings = require('vs/base/common/strings');
 import lifecycle = require('vs/base/common/lifecycle');
 import mime = require('vs/base/common/mime');
 import Event, { Emitter } from 'vs/base/common/event';
@@ -268,7 +269,12 @@ export class DebugService implements debug.IDebugService {
 
 		this.toDisposeOnSessionEnd.push(this.session.onDidContinue(threadID => {
 			aria.status(nls.localize('debuggingContinued', "Debugging continued."));
-			this.model.clearThreads(false, threadID);
+			// TODO@Isidor temporary workaround for #5835
+			if (strings.equalsIgnoreCase(this.session.configuration.type, 'go')) {
+				this.model.clearThreads(false);
+			} else {
+				this.model.clearThreads(false, threadID);
+			}
 
 			// Get a top stack frame of a stopped thread if there is any.
 			const threads = this.model.getThreads();