diff --git a/src/share/classes/sun/tools/jconsole/Worker.java b/src/share/classes/sun/tools/jconsole/Worker.java
index 891adb747d2e84c4224e133ede11a05971da6d87..d9d235ecf0ff92d5d4bef06cb37fc304a3da2ec6 100644
--- a/src/share/classes/sun/tools/jconsole/Worker.java
+++ b/src/share/classes/sun/tools/jconsole/Worker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ import java.util.*;
 
 public class Worker extends Thread {
     ArrayList<Runnable> jobs = new ArrayList<Runnable>();
-    private boolean stopped = false;
+    private volatile boolean stopped = false;
 
     public Worker(String name) {
         super("Worker-"+name);
@@ -38,17 +38,17 @@ public class Worker extends Thread {
     }
 
     public void run() {
-        while (!isStopped()) {
+        while (!stopped) {
             Runnable job;
             synchronized(jobs) {
-                while (!isStopped() && jobs.size() == 0) {
+                while (!stopped && jobs.size() == 0) {
                     try {
                         jobs.wait();
                     } catch (InterruptedException ex) {
                     }
                 }
 
-                if(isStopped()) break;
+                if(stopped) break;
 
                 job = jobs.remove(0);
             }
@@ -56,11 +56,7 @@ public class Worker extends Thread {
         }
     }
 
-    private synchronized boolean isStopped() {
-        return stopped;
-    }
-
-    public synchronized void stopWorker() {
+    public void stopWorker() {
         stopped = true;
         synchronized(jobs) {
             jobs.notify();
diff --git a/test/sun/tools/jconsole/WorkerDeadlockTest.java b/test/sun/tools/jconsole/WorkerDeadlockTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9614a565a077b221d954de05ad086d8a9916ff19
--- /dev/null
+++ b/test/sun/tools/jconsole/WorkerDeadlockTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8236872
+ * @summary The test tries to catch a deadlock by creating a new worker,
+ * starting it, adding an empty job and immediately stopping it.
+ * @modules jdk.jconsole/sun.tools.jconsole
+ * @run main WorkerDeadlockTest
+ */
+
+import sun.tools.jconsole.Worker;
+
+
+public class WorkerDeadlockTest {
+    private static final int REPEAT_NUMBER = 1000;
+
+    public static void main(String[] args) {
+
+        for (int i = 1; i < REPEAT_NUMBER; i++) {
+            Worker worker = new Worker("worker-" + i);
+            worker.start();
+            worker.add(() -> { });
+            worker.stopWorker();
+            System.out.println("Worker " + i + " was successfully stopped");
+        }
+    }
+}