diff --git a/projects/rocshmem/src/memory/notifier.hpp b/projects/rocshmem/src/memory/notifier.hpp
index b72a256f15..946a9c291e 100644
--- a/projects/rocshmem/src/memory/notifier.hpp
+++ b/projects/rocshmem/src/memory/notifier.hpp
@@ -78,9 +78,12 @@ class Notifier {
       }
     }
 
-    while (detail::atomic::load<uint32_t, scope>(&signal_, orders_) != done) {
-      ;
+    if (executor) {
+      while (detail::atomic::load<uint32_t, scope>(&signal_, orders_) != done) {
+        ;
+      }
     }
+    __syncthreads();
   }
 
  private: