diff --git a/app/src/main/java/awais/instagrabber/managers/ThreadManager.java b/app/src/main/java/awais/instagrabber/managers/ThreadManager.java
index 6074363e..3f2a59d1 100644
--- a/app/src/main/java/awais/instagrabber/managers/ThreadManager.java
+++ b/app/src/main/java/awais/instagrabber/managers/ThreadManager.java
@@ -189,7 +189,7 @@ public final class ThreadManager {
                 return null;
             }
             final DirectThread thread = threads.stream()
-                                               .filter(t -> t.getThreadId().equals(threadId))
+                                               .filter(t -> Objects.equals(t.getThreadId(), threadId))
                                                .findFirst()
                                                .orElse(null);
             if (thread != null) {