diff --git a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
index 4841eb94d9..2132c086be 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
@@ -168,7 +168,11 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
                                                 "closeConnectionReason=" + closeConnectionReason +
                                                 " / isIntended=" + closeConnectionReason.isIntended +
                                                 " / Memory(MB): " + Profiler.getUsedMemory());
-                                    doRemoveProtectedExpirableData(protectedData, hashOfPayload);
+
+                                    // TODO We get closeConnectionReason TERMINATED which removes offers which should nto be removed
+                                    // TODO investigate why EOFException happens
+                                    //doRemoveProtectedExpirableData(protectedData, hashOfPayload);
+                                    
                                 } else {
                                     log.debug("Remove data ignored as we don't have an entry for that data.");
                                 }