diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/OnosCopycatClient.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/OnosCopycatClient.java
index a170afb..3a0ed32 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/OnosCopycatClient.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/OnosCopycatClient.java
@@ -55,7 +55,8 @@
             || e instanceof ClosedChannelException
             || e instanceof QueryException
             || e instanceof UnknownSessionException
-            || e instanceof ClosedSessionException;
+            || e instanceof ClosedSessionException
+            || e instanceof StorageException.Unavailable;
 
     OnosCopycatClient(CopycatClient client, int maxRetries, long delayBetweenRetriesMillis) {
         super(client);
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
index 92170d4..0c1d8a6 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
@@ -225,6 +225,6 @@
                 throw new ResourceManagerException(e);
             }
         }
-        return new ResourceClient(new OnosCopycatClient(copycatClient, 2, 100));
+        return new ResourceClient(new OnosCopycatClient(copycatClient, 5, 100));
     }
 }