diff --git a/PersistentStore/PersistentStore.cpp b/PersistentStore/PersistentStore.cpp
index caf8a730ed..cfce5e185c 100644
--- a/PersistentStore/PersistentStore.cpp
+++ b/PersistentStore/PersistentStore.cpp
@@ -93,7 +93,7 @@ namespace Plugin {
 
         uint32_t connectionId;
 
-        _deviceStore2 = service->Root<Exchange::IStore2>(connectionId, 2000, _T("SqliteStore2"));
+        _deviceStore2 = service->Root<Exchange::IStore2>(connectionId, RPC::CommunicationTimeOut, _T("SqliteStore2"));
         if (_deviceStore2 != nullptr) {
             _deviceStore2->Register(&_store2Sink);
             _deviceStore2->Register(_store);
@@ -102,7 +102,7 @@ namespace Plugin {
             _deviceStoreLimit = _deviceStore2->QueryInterface<Exchange::IStoreLimit>();
         }
 
-        _accountStore2 = service->Root<Exchange::IStore2>(connectionId, 2000, _T("GrpcStore2"));
+        _accountStore2 = service->Root<Exchange::IStore2>(connectionId, RPC::CommunicationTimeOut, _T("GrpcStore2"));
         if (_accountStore2 != nullptr) {
             _accountStore2->Register(&_store2Sink);
         }