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..8fb084c 100644
--- a/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java
+++ b/core/src/main/java/org/infinispan/configuration/cache/LegacyConfigurationAdaptor.java
@@ -76,7 +76,7 @@
       } else {
          legacy.clustering()
             .l1()
-               .disable();
+               .disable().onRehash(config.clustering().l1().onRehash());
       }
       
       legacy.clustering()
diff --git a/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java b/core/src/test/java/org/infinispan/configuration/ConfigurationUnitTest.java
index d21a0c9..64886d7 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,12 @@ public void testInvocationBatchingAndNonTransactional() {
       new DefaultCacheManager(c);
    }
    
+   @Test
+   public void testL1Config() {
+      ConfigurationBuilder cb = new ConfigurationBuilder();
+      cb.clustering().cacheMode(CacheMode.DIST_SYNC).l1().disable().disableOnRehash();
+      org.infinispan.config.Configuration legacy = new LegacyConfigurationAdaptor().adapt(cb.build());
+      Assert.assertFalse(legacy.isL1CacheEnabled());
+      Assert.assertFalse(legacy.isL1OnRehash());
+   }
 }