diff --git a/src/main/java/net/corda/explorer/rpc/NodeRPCClient.java b/src/main/java/net/corda/explorer/rpc/NodeRPCClient.java
index 5f851dd..f3ef7aa 100644
--- a/src/main/java/net/corda/explorer/rpc/NodeRPCClient.java
+++ b/src/main/java/net/corda/explorer/rpc/NodeRPCClient.java
@@ -26,7 +26,6 @@
 @Component
 public class NodeRPCClient {
     private static final Logger logger = LoggerFactory.getLogger(NodeRPCClient.class);
-
     private static CordaRPCOps rpcProxy;
     private static Session sshSession;
     private Map<String, String> partyKeyMap = new HashMap<>();
diff --git a/src/main/java/net/corda/explorer/service/impl/VaultServiceImpl.java b/src/main/java/net/corda/explorer/service/impl/VaultServiceImpl.java
index 371680e..5d90e85 100644
--- a/src/main/java/net/corda/explorer/service/impl/VaultServiceImpl.java
+++ b/src/main/java/net/corda/explorer/service/impl/VaultServiceImpl.java
@@ -28,6 +28,9 @@ public Vault.Page getVaultStates(VaultFilterSelection filter) throws ClassNotFou
                 new PageSpecification(filter.getOffset() + 1, filter.getPageSize());
 
         /* ContractStateType Filters */
+        if(contractStateClassMap.size()==0){
+            getVaultFilters();
+        }
         Set<Class<ContractState>> stateType = ImmutableSet.of(ContractState.class);
         HashSet<Class<ContractState>> stateTypeSet = new HashSet<>();
         if(filter.getStateTypes() != null &&  filter.getStateTypes().size() > 0){