diff --git a/src/GDBDebugSession.ts b/src/GDBDebugSession.ts
index 29bf1b65..f0df3d7f 100644
--- a/src/GDBDebugSession.ts
+++ b/src/GDBDebugSession.ts
@@ -1634,7 +1634,7 @@ export class GDBDebugSession extends LoggingDebugSession {
 
     protected handleGDBAsync(resultClass: string, resultData: any) {
         const updateIsRunning = () => {
-            this.isRunning = true;
+            this.isRunning = this.threads.length ? true : false;
             for (const thread of this.threads) {
                 if (!thread.running) {
                     this.isRunning = false;
diff --git a/src/integration-tests/terminated.spec.ts b/src/integration-tests/terminated.spec.ts
new file mode 100644
index 00000000..9a2c1f9e
--- /dev/null
+++ b/src/integration-tests/terminated.spec.ts
@@ -0,0 +1,67 @@
+/*********************************************************************
+ * Copyright (c) 2023 Kichwa Coders Canada Inc. and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *********************************************************************/
+
+// import { expect } from 'chai';
+import * as path from 'path';
+import { LaunchRequestArguments } from '../GDBDebugSession';
+import { CdtDebugClient } from './debugClient';
+import {
+    fillDefaults,
+    getScopes,
+    standardBeforeEach,
+    testProgramsDir,
+} from './utils';
+
+describe('terminated', function () {
+    let dc: CdtDebugClient;
+    const emptyProgram = path.join(testProgramsDir, 'empty');
+    const emptySrc = path.join(testProgramsDir, 'empty.c');
+
+    beforeEach(async function () {
+        dc = await standardBeforeEach();
+    });
+
+    afterEach(async function () {
+        await dc.stop();
+    });
+
+    it('terminated event arrives after continuing after a breakpoint', async function () {
+        await dc.hitBreakpoint(
+            fillDefaults(this.test, {
+                program: emptyProgram,
+            } as LaunchRequestArguments),
+            {
+                path: emptySrc,
+                line: 3,
+            }
+        );
+
+        await Promise.all([
+            dc.waitForEvent('terminated'),
+            dc.continueRequest({ threadId: (await getScopes(dc)).thread.id }),
+        ]);
+    });
+
+    it('terminated event arrives on a short run', async function () {
+        await Promise.all([
+            dc.waitForEvent('terminated'),
+
+            dc
+                .waitForEvent('initialized')
+                .then((_event) => dc.configurationDoneRequest()),
+
+            dc.launch(
+                fillDefaults(this.test, {
+                    program: emptyProgram,
+                } as LaunchRequestArguments)
+            ),
+        ]);
+    });
+});