diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
index d40d9475f7..09c1378d69 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
@@ -335,6 +335,7 @@ class DelayableUOW(val manager:DBManager) extends BaseRetained {
        id.setFutureOrSequenceLong(queueSeq)
     } else {
       id.setFutureOrSequenceLong(countDownFuture)
+      message.setRecievedByDFBridge(true)
       countDownFuture.id = id
     }
 
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitLevelDBTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitLevelDBTest.java
new file mode 100644
index 0000000000..5a485404c8
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitLevelDBTest.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.bugs;
+
+import java.io.File;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStore;
+
+public class AMQ4485LowLimitLevelDBTest extends AMQ4485LowLimitTest {
+
+    public AMQ4485LowLimitLevelDBTest() {
+        super();
+        numBrokers = 2;
+    }
+
+    protected BrokerService createBroker(int brokerid, boolean addToNetwork) throws Exception {
+        BrokerService broker = super.createBroker(brokerid, addToNetwork);
+
+        LevelDBStore levelDBStore = new LevelDBStore();
+        levelDBStore.setDirectory(new File(broker.getBrokerDataDirectory(),"levelDB"));
+        broker.setPersistenceAdapter(levelDBStore);
+        return broker;
+    }
+}
\ No newline at end of file
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
index 38c85da38f..21c389f390 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java
@@ -64,7 +64,7 @@ public class AMQ4485LowLimitTest extends JmsMultipleBrokersTestSupport {
     static final String payload = new String(new byte[10 * 1024]);
     private static final Logger LOG = LoggerFactory.getLogger(AMQ4485LowLimitTest.class);
     final int portBase = 61600;
-    final int numBrokers = 8;
+    int numBrokers = 8;
     final int numProducers = 30;
     final int numMessages = 1000;
     final int consumerSleepTime = 40;