diff --git a/Graphics/GraphicsTools/src/RenderStateCacheImpl.cpp b/Graphics/GraphicsTools/src/RenderStateCacheImpl.cpp
index da7baaeba..0fd0a9803 100644
--- a/Graphics/GraphicsTools/src/RenderStateCacheImpl.cpp
+++ b/Graphics/GraphicsTools/src/RenderStateCacheImpl.cpp
@@ -849,6 +849,8 @@ bool RenderStateCacheImpl::CreatePipelineStateInternal(const CreateInfoType& PSO
         UnpackInfo.PipelineType                  = PSOCreateInfo.PSODesc.PipelineType;
         UnpackInfo.Name                          = HashStr.c_str();
         UnpackInfo.pDevice                       = m_pDevice;
+        UnpackInfo.SRBAllocationGranularity      = PSOCreateInfo.PSODesc.SRBAllocationGranularity;
+        UnpackInfo.ImmediateContextMask          = PSOCreateInfo.PSODesc.ImmediateContextMask;
         UnpackInfo.pCache                        = PSOCreateInfo.pPSOCache;
         UnpackInfo.ModifyPipelineStateCreateInfo = Callback;
         UnpackInfo.pUserData                     = Callback;
@@ -859,7 +861,11 @@ bool RenderStateCacheImpl::CreatePipelineStateInternal(const CreateInfoType& PSO
             const PIPELINE_STATE_STATUS Status = pPSO->GetStatus();
             if (Status == PIPELINE_STATE_STATUS_READY)
             {
-                if (pPSO->GetDesc() == PSOCreateInfo.PSODesc)
+                // The device clears the bits of the immediate context mask that have no command queue,
+                // so the unpacked pipeline may hold a subset of the requested mask.
+                PipelineStateDesc ExpectedDesc = PSOCreateInfo.PSODesc;
+                ExpectedDesc.ImmediateContextMask &= pPSO->GetDesc().ImmediateContextMask;
+                if (pPSO->GetDesc() == ExpectedDesc)
                 {
                     *ppPipelineState = pPSO.Detach();
                     FoundInCache     = true;
diff --git a/Tests/DiligentCoreAPITest/src/RenderStateCacheTest.cpp b/Tests/DiligentCoreAPITest/src/RenderStateCacheTest.cpp
index 570650338..f87781e39 100644
--- a/Tests/DiligentCoreAPITest/src/RenderStateCacheTest.cpp
+++ b/Tests/DiligentCoreAPITest/src/RenderStateCacheTest.cpp
@@ -1345,6 +1345,59 @@ TEST(RenderStateCacheTest, CreateComputePSO_Sign_Async)
     TestComputePSO(/*UseSignature = */ true, /*CompileAsync = */ true);
 }
 
+// The archive does not store SRBAllocationGranularity and ImmediateContextMask; the dearchiver takes them from the
+// unpack info. A pipeline created with non-default values must be found in a loaded cache and keep those values; the
+// device reduces the mask to its immediate contexts, which must not make the unpacked pipeline look different.
+TEST(RenderStateCacheTest, ArchivedPSOKeepsDescription)
+{
+    GPUTestingEnvironment* pEnv    = GPUTestingEnvironment::GetInstance();
+    IRenderDevice*         pDevice = pEnv->GetDevice();
+    if (!pDevice->GetDeviceInfo().Features.ComputeShaders)
+        GTEST_SKIP() << "Compute shaders are not supported by this device";
+
+    GPUTestingEnvironment::ScopedReset AutoReset;
+
+    RefCntAutoPtr<IShaderSourceInputStreamFactory> pShaderSourceFactory;
+    pDevice->GetEngineFactory()->CreateDefaultShaderSourceStreamFactory("shaders/RenderStateCache", &pShaderSourceFactory);
+    ASSERT_NE(nullptr, pShaderSourceFactory);
+
+    constexpr Uint32 SRBAllocationGranularity = 4;
+    // All bits: not the default mask on any device, and the device reduces it to its immediate contexts.
+    constexpr Uint64 RequestedContextMask = ~Uint64{0};
+    const Uint64     DeviceContextMask    = (Uint64{1} << pEnv->GetNumImmediateContexts()) - 1;
+
+    RefCntAutoPtr<IDataBlob> pArchiveData;
+    for (Uint32 Pass = 0; Pass < 2; ++Pass)
+    {
+        SCOPED_TRACE(Pass);
+        auto pCache = CreateCache(pDevice, false, pArchiveData);
+        ASSERT_NE(nullptr, pCache);
+
+        RefCntAutoPtr<IShader> pCS;
+        CreateComputeShader(pCache, pShaderSourceFactory, SHADER_COMPILE_FLAG_NONE, pCS, Pass != 0);
+        ASSERT_NE(nullptr, pCS);
+
+        ComputePipelineStateCreateInfo PSOCI;
+        PSOCI.PSODesc.Name                               = "Archived pipeline description";
+        PSOCI.PSODesc.SRBAllocationGranularity           = SRBAllocationGranularity;
+        PSOCI.PSODesc.ImmediateContextMask               = RequestedContextMask;
+        PSOCI.PSODesc.ResourceLayout.DefaultVariableType = SHADER_RESOURCE_VARIABLE_TYPE_MUTABLE;
+        PSOCI.pCS                                        = pCS;
+        RefCntAutoPtr<IPipelineState> pPSO;
+        EXPECT_EQ(Pass != 0, pCache->CreateComputePipelineState(PSOCI, &pPSO));
+        ASSERT_NE(nullptr, pPSO);
+        ASSERT_EQ(PIPELINE_STATE_STATUS_READY, pPSO->GetStatus());
+        PipelineStateDesc ExpectedDesc    = PSOCI.PSODesc;
+        ExpectedDesc.ImmediateContextMask = DeviceContextMask;
+        EXPECT_EQ(ExpectedDesc, pPSO->GetDesc());
+        VerifyComputePSO(pPSO, /*UseSignature = */ true);
+
+        pArchiveData.Release();
+        ASSERT_TRUE(pCache->WriteToBlob(ContentVersion, &pArchiveData));
+        ASSERT_NE(nullptr, pArchiveData);
+    }
+}
+
 
 TEST(RenderStateCacheTest, CacheByFileName)
 {