diff --git a/core/src/main/java/org/infinispan/config/Configuration.java b/core/src/main/java/org/infinispan/config/Configuration.java
index 50c7107..c149c46 100644
--- a/core/src/main/java/org/infinispan/config/Configuration.java
+++ b/core/src/main/java/org/infinispan/config/Configuration.java
@@ -1386,6 +1386,10 @@ public boolean isL1OnRehash() {
       return clustering.l1.onRehash;
    }
 
+   public boolean hasConsistentHashClass() {
+      return clustering.hash.consistentHashClass != null;
+   }
+   
    public String getConsistentHashClass() {
       if (clustering.hash.consistentHashClass == null) {
          clustering.hash.consistentHashClass = globalConfiguration == null || globalConfiguration.hasTopologyInfo() ? TopologyAwareConsistentHash.class.getName() : DefaultConsistentHash.class.getName();
diff --git a/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java b/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java
index 50e48c6..466d200 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java
@@ -276,7 +276,7 @@
                .replQueueMaxElements(legacy.getReplQueueMaxElements());
       }
       
-      if (legacy.getConsistentHashClass() != null) {
+      if (legacy.hasConsistentHashClass()) {
          builder.clustering()
             .hash()
                .consistentHash(Util.<ConsistentHash>getInstance(legacy.getConsistentHashClass(), legacy.getClassLoader()));
diff --git a/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java b/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java
index d21a0c9..c9e3bf3 100644
--- a/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java
+++ b/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java
@@ -31,7 +31,6 @@
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.configuration.cache.LegacyConfigurationAdaptor;
 import org.infinispan.manager.DefaultCacheManager;
-import org.infinispan.transaction.TransactionMode;
 import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -132,4 +131,9 @@ public void testInvocationBatchingAndNonTransactional() {
       new DefaultCacheManager(c);
    }
    
+   @Test
+   public void testConsistentHash() {
+      Configuration config = new LegacyConfigurationAdaptor().adapt(new org.infinispan.config.Configuration());
+      Assert.assertNull(config.clustering().hash().consistentHash());
+   }
 }