diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java b/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java
index d9e7434e0c..9d76c1fcd1 100644
--- a/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java
+++ b/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Data.java
@@ -1,7 +1,5 @@
 package com.baeldung.concurrent.waitandnotify;
 
-import org.slf4j.Logger;
-
 public class Data {
     private String packet;
     
@@ -14,6 +12,7 @@ public class Data {
             try {
                 wait();
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt(); 
                 System.out.println("Thread Interrupted");
             }
         }
@@ -28,6 +27,7 @@ public class Data {
             try { 
                 wait();
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt(); 
                 System.out.println("Thread Interrupted");
             }
         }
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java b/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java
index 724e908a99..21ba822bfd 100644
--- a/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java
+++ b/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Receiver.java
@@ -20,6 +20,7 @@ public class Receiver implements Runnable {
             try {
                 Thread.sleep(ThreadLocalRandom.current().nextInt(1000, 5000));
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt(); 
                 System.out.println("Thread Interrupted");
             }
         }
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java b/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java
index b4945b7b73..c365294cdd 100644
--- a/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java
+++ b/core-java-concurrency/src/main/java/com/baeldung/concurrent/waitandnotify/Sender.java
@@ -25,6 +25,7 @@ public class Sender implements Runnable {
             try {
                 Thread.sleep(ThreadLocalRandom.current().nextInt(1000, 5000));
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt(); 
                 System.out.println("Thread Interrupted");
             }
         }
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java
index 8ecc92236e..e2bc328df3 100644
--- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/waitandnotify/NetworkIntegrationTest.java
@@ -57,7 +57,8 @@ public class NetworkIntegrationTest {
             sender.join();
             receiver.join();
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            Thread.currentThread().interrupt(); 
+            System.out.println("Thread Interrupted");
         }
         
         assertEquals(expected, outContent.toString());