diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index e978a99262..3bc9227763 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -152,7 +152,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
                 nodeAddress -> onionAddress.setText(nodeAddress == null ? "Not known yet..." : p2PService.getAddress().getFullAddress()));
         numP2PPeersSubscription = EasyBind.subscribe(p2PService.getNumConnectedPeers(), numPeers -> updateP2PTable());
         totalTraffic.textProperty().bind(EasyBind.combine(Statistic.totalSentBytesProperty(), Statistic.totalReceivedBytesProperty(),
-                (sent, received) -> "Sent: " + formatter.formatBytes((int) sent) + ", received: " + formatter.formatBytes((int) received)));
+                (sent, received) -> "Sent: " + formatter.formatBytes((long) sent) + ", received: " + formatter.formatBytes((long) received)));
 
         sortedList.comparatorProperty().bind(tableView.comparatorProperty());
         tableView.setItems(sortedList);
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/P2pNetworkListItem.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/P2pNetworkListItem.java
index d5ab8b80b6..bc1e1d0b30 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/P2pNetworkListItem.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/P2pNetworkListItem.java
@@ -55,9 +55,9 @@ public class P2pNetworkListItem {
         this.statistic = connection.getStatistic();
 
         sentBytesSubscription = EasyBind.subscribe(statistic.sentBytesProperty(),
-                e -> sentBytes.set(formatter.formatBytes((int) e)));
+                e -> sentBytes.set(formatter.formatBytes((long) e)));
         receivedBytesSubscription = EasyBind.subscribe(statistic.receivedBytesProperty(),
-                e -> receivedBytes.set(formatter.formatBytes((int) e)));
+                e -> receivedBytes.set(formatter.formatBytes((long) e)));
         onionAddressSubscription = EasyBind.subscribe(connection.peersNodeAddressProperty(),
                 nodeAddress -> onionAddress.set(nodeAddress != null ? nodeAddress.getFullAddress() : "Not known yet"));
         roundTripTimeSubscription = EasyBind.subscribe(statistic.roundTripTimeProperty(),
diff --git a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
index 42d367a326..ed5f6f06ea 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
@@ -489,7 +489,7 @@ public class BSFormatter {
             return isOfferer ? "Seller (offerer)" : "Buyer (taker)";
     }
 
-    public String formatBytes(int bytes) {
+    public String formatBytes(long bytes) {
         double kb = 1024;
         double mb = kb * kb;
         DecimalFormat decimalFormat = new DecimalFormat("#.##");
diff --git a/network/src/main/java/io/bitsquare/p2p/network/Statistic.java b/network/src/main/java/io/bitsquare/p2p/network/Statistic.java
index ac22e6f898..372e3ab9cd 100644
--- a/network/src/main/java/io/bitsquare/p2p/network/Statistic.java
+++ b/network/src/main/java/io/bitsquare/p2p/network/Statistic.java
@@ -3,7 +3,9 @@ package io.bitsquare.p2p.network;
 import io.bitsquare.common.UserThread;
 import io.bitsquare.p2p.Message;
 import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleLongProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,22 +21,22 @@ public class Statistic {
     // Static
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private final static IntegerProperty totalSentBytes = new SimpleIntegerProperty(0);
-    private final static IntegerProperty totalReceivedBytes = new SimpleIntegerProperty(0);
+    private final static LongProperty totalSentBytes = new SimpleLongProperty(0);
+    private final static LongProperty totalReceivedBytes = new SimpleLongProperty(0);
 
-    public static int getTotalSentBytes() {
+    public static long getTotalSentBytes() {
         return totalSentBytes.get();
     }
 
-    public static IntegerProperty totalSentBytesProperty() {
+    public static LongProperty totalSentBytesProperty() {
         return totalSentBytes;
     }
 
-    public static int getTotalReceivedBytes() {
+    public static long getTotalReceivedBytes() {
         return totalReceivedBytes.get();
     }
 
-    public static IntegerProperty totalReceivedBytesProperty() {
+    public static LongProperty totalReceivedBytesProperty() {
         return totalReceivedBytes;
     }
 
@@ -45,8 +47,8 @@ public class Statistic {
 
     private final Date creationDate;
     private long lastActivityTimestamp = System.currentTimeMillis();
-    private final IntegerProperty sentBytes = new SimpleIntegerProperty(0);
-    private final IntegerProperty receivedBytes = new SimpleIntegerProperty(0);
+    private final LongProperty sentBytes = new SimpleLongProperty(0);
+    private final LongProperty receivedBytes = new SimpleLongProperty(0);
     private final Map<String, Integer> receivedMessages = new ConcurrentHashMap<>();
     private final Map<String, Integer> sentMessages = new ConcurrentHashMap<>();
     private final IntegerProperty roundTripTime = new SimpleIntegerProperty(0);
@@ -117,19 +119,19 @@ public class Statistic {
         return System.currentTimeMillis() - lastActivityTimestamp;
     }
 
-    public int getSentBytes() {
+    public long getSentBytes() {
         return sentBytes.get();
     }
 
-    public IntegerProperty sentBytesProperty() {
+    public LongProperty sentBytesProperty() {
         return sentBytes;
     }
 
-    public int getReceivedBytes() {
+    public long getReceivedBytes() {
         return receivedBytes.get();
     }
 
-    public IntegerProperty receivedBytesProperty() {
+    public LongProperty receivedBytesProperty() {
         return receivedBytes;
     }