diff --git a/projects/rccl/src/clique/CliqueManager.cc b/projects/rccl/src/clique/CliqueManager.cc
index 93c8eb091c..665d882e41 100644
--- a/projects/rccl/src/clique/CliqueManager.cc
+++ b/projects/rccl/src/clique/CliqueManager.cc
@@ -72,6 +72,28 @@ CliqueManager::~CliqueManager()
 
 void CliqueManager::CleanUp()
 {
+  if (rcclParamEnableClique())
+  {
+    if (m_rank == 0)
+    {
+      int pid = getpid();
+      for (auto it = CliqueShmNames.begin(); it != CliqueShmNames.end(); it++)
+      {
+        std::string msgQueueName = "/tmp/" + it->second + std::to_string(m_hash) + "_" + std::to_string(pid);
+        ncclResult_t res = MsgQueueClose(msgQueueName, m_hash);
+        if (res != ncclSuccess)
+        {
+          WARN("Unable to close Message Queue: %s\n", msgQueueName.c_str());
+        }
+        int ret = unlink(msgQueueName.c_str());
+        if (ret != 0)
+        {
+          WARN("Unable to unlink %s\n", msgQueueName.c_str());
+        }
+      }
+    }
+  }
+
   if (m_cliqueMode == CLIQUE_DISABLED) return;
 
   // Free variables that are shared between SINGLE_PROCESS / SINGLE_NODE
@@ -102,6 +124,7 @@ void CliqueManager::CleanUp()
     if (m_rank == 0 && m_staticGpuBarrierMem)
       hipFree(m_staticGpuBarrierMem);
   }
+
   m_init = false;
 }
 
@@ -112,6 +135,7 @@ ncclResult_t CliqueManager::Init(ncclUniqueId const* commId, int suffix)
   if (m_init) return ncclSuccess;
   m_init = true;
 
+  m_hash = djb2Hash(commId->internal);
   if (m_cliqueMode == CLIQUE_DISABLED) return ncclSuccess;
 
   // Check parameters
@@ -143,8 +167,8 @@ ncclResult_t CliqueManager::Init(ncclUniqueId const* commId, int suffix)
     return ncclSuccess;
   }
 
-  unsigned long hash = djb2Hash(commId->internal);
-  std::string shmSuffix = std::to_string(hash) + "_" + std::to_string(suffix);
+
+  std::string shmSuffix = std::to_string(m_hash) + "_" + std::to_string(suffix);
 
   // Allocate sense barrier variable on local GPU
   NCCLCHECKGOTO(ncclCudaCalloc(&m_gpuBarrierLocalSense, NCCL_MAX_OPS * sizeof(int)), res, dropback);
@@ -152,7 +176,7 @@ ncclResult_t CliqueManager::Init(ncclUniqueId const* commId, int suffix)
   if (m_cliqueMode == CLIQUE_SINGLE_NODE)
   {
     // Initialize shared memory file for IPC handles (based on commId hash)
-    m_shmHandles = NcclIpcHandleShm(m_rank, m_numRanks, hash, NUM_HANDLES_PER_RANK, NCCL_MAX_OPS, shmSuffix);
+    m_shmHandles = NcclIpcHandleShm(m_rank, m_numRanks, m_hash, NUM_HANDLES_PER_RANK, NCCL_MAX_OPS, shmSuffix);
     NCCLCHECKGOTO(m_shmHandles.Open(), res, dropback);
 
     // Initialize IPC caches
@@ -167,7 +191,7 @@ ncclResult_t CliqueManager::Init(ncclUniqueId const* commId, int suffix)
                                                      CliqueShmNames["Barriers"] + shmSuffix,
                                                      m_rank,
                                                      m_numRanks,
-                                                     hash);
+                                                     m_hash);
     NCCLCHECKGOTO(m_sharedIpcHandle.Open(), res, dropback);
 
     if (m_rank == 0)
@@ -194,7 +218,7 @@ ncclResult_t CliqueManager::Init(ncclUniqueId const* commId, int suffix)
                                            CliqueShmNames["SharedCounters"] + shmSuffix,
                                            m_rank,
                                            m_numRanks,
-                                           hash);
+                                           m_hash);
     NCCLCHECKGOTO(m_sharedCpuMemory.Open(), res, dropback);
 
     // Split up the shared CPU memory for barrier counters / global sense
@@ -511,7 +535,6 @@ ncclResult_t CliqueManager::BootstrapRootInit(int pid, unsigned long hash)
         std::string msgQueueName = "/tmp/" + it->second + std::to_string(hash) + "_" + std::to_string(pid);
         SYSCHECKVAL(open(msgQueueName.c_str(), O_CREAT | O_RDWR, 0606), "open", fd);
         NCCLCHECK(MsgQueueGetId(msgQueueName, hash, true, msgid));
-        SYSCHECK(unlink(msgQueueName.c_str()), "unlink");
         SYSCHECK(close(fd), "close");
       }
 
diff --git a/projects/rccl/src/clique/CliqueManager.h b/projects/rccl/src/clique/CliqueManager.h
index b522d9e036..d88ecfbf31 100644
--- a/projects/rccl/src/clique/CliqueManager.h
+++ b/projects/rccl/src/clique/CliqueManager.h
@@ -95,6 +95,7 @@ protected:
 
   int                          m_rank;                               // Associated rank
   int                          m_numRanks;                           // Total number of ranks
+  unsigned long                m_hash;                               // Hash used for identifying message queues & shared memory
   cliqueMode_t                 m_cliqueMode;                         // Clique mode (off/single process/single node)
   bool                         m_init;                               // Whether CliqueManager has been initialized
   cliqueDevicePtrs_t*          m_pinnedCliquePtrs;                   // Pinned-host-memory (device accessible) containing device pointers
diff --git a/projects/rccl/src/clique/MsgQueue.cc b/projects/rccl/src/clique/MsgQueue.cc
index 716c449e8f..ef5dd6fa19 100644
--- a/projects/rccl/src/clique/MsgQueue.cc
+++ b/projects/rccl/src/clique/MsgQueue.cc
@@ -32,7 +32,6 @@ ncclResult_t MsgQueueGetId(std::string name, int projid, bool exclusive, int& ms
   key_t key;
   SYSCHECKVAL(ftok(name.c_str(), projid), "ftok", key);
   int flag = (exclusive == true ? IPC_CREAT | IPC_EXCL : IPC_CREAT);
-
   msgid = msgget(key, MSG_QUEUE_PERM | flag);
   // Check if we're trying to create message queue and it already exists; if so, delete existing queue
   if (msgid == -1 && exclusive == true && errno == EEXIST)
@@ -66,7 +65,7 @@ ncclResult_t MsgQueueClose(std::string name, int projid)
   key_t key;
   int msgid;
   key = ftok(name.c_str(), projid);
-  SYSCHECKVAL(msgget(key, IPC_CREAT), "msgget", msgid);
+  SYSCHECKVAL(msgget(key, 0), "msgget", msgid);
   SYSCHECK(msgctl(msgid, IPC_RMID, NULL), "msgctl");
   return ncclSuccess;
 }
diff --git a/projects/rccl/src/clique/ShmObject.h b/projects/rccl/src/clique/ShmObject.h
index f458014f5e..144f10d22c 100644
--- a/projects/rccl/src/clique/ShmObject.h
+++ b/projects/rccl/src/clique/ShmObject.h
@@ -136,6 +136,7 @@ ncclResult_t ShmObject<T>::Open()
     int msgid;
     std::string tmpFileName = "/tmp/" + m_shmName;
     NCCLCHECK(MsgQueueGetId(tmpFileName, m_projid, false, msgid));
+
     if (m_rank == 0)
     {
       ncclResult_t resultSetup = shmSetupExclusive(m_shmName.c_str(), m_shmSize, &shmFd, (void**)&m_shmPtr, 1);