diff --git a/lib/model/model.go b/lib/model/model.go
index 425cbfc51..a84ea54df 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -1003,7 +1003,7 @@ func (m *Model) deviceStatRef(deviceID protocol.DeviceID) *stats.DeviceStatistic
 		return sr
 	}
 
-	sr := stats.NewDeviceStatisticsReference(m.db, deviceID)
+	sr := stats.NewDeviceStatisticsReference(m.db, deviceID.String())
 	m.deviceStatRefs[deviceID] = sr
 	return sr
 }
@@ -1025,7 +1025,7 @@ func (m *Model) folderStatRef(folder string) *stats.FolderStatisticsReference {
 }
 
 func (m *Model) receivedFile(folder string, file protocol.FileInfo) {
-	m.folderStatRef(folder).ReceivedFile(file)
+	m.folderStatRef(folder).ReceivedFile(file.Name, file.IsDeleted())
 }
 
 func sendIndexes(conn protocol.Connection, folder string, fs *db.FileSet, ignores *ignore.Matcher) {
diff --git a/lib/stats/device.go b/lib/stats/device.go
index 2bace241e..c24f98f07 100644
--- a/lib/stats/device.go
+++ b/lib/stats/device.go
@@ -9,7 +9,6 @@ package stats
 import (
 	"time"
 
-	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syndtr/goleveldb/leveldb"
 )
@@ -20,11 +19,11 @@ type DeviceStatistics struct {
 
 type DeviceStatisticsReference struct {
 	ns     *db.NamespacedKV
-	device protocol.DeviceID
+	device string
 }
 
-func NewDeviceStatisticsReference(ldb *leveldb.DB, device protocol.DeviceID) *DeviceStatisticsReference {
-	prefix := string(db.KeyTypeDeviceStatistic) + device.String()
+func NewDeviceStatisticsReference(ldb *leveldb.DB, device string) *DeviceStatisticsReference {
+	prefix := string(db.KeyTypeDeviceStatistic) + device
 	return &DeviceStatisticsReference{
 		ns:     db.NewNamespacedKV(ldb, prefix),
 		device: device,
diff --git a/lib/stats/folder.go b/lib/stats/folder.go
index 0dcc1a024..6503885f5 100644
--- a/lib/stats/folder.go
+++ b/lib/stats/folder.go
@@ -9,8 +9,6 @@ package stats
 import (
 	"time"
 
-	"github.com/syncthing/protocol"
-
 	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syndtr/goleveldb/leveldb"
 )
@@ -55,13 +53,13 @@ func (s *FolderStatisticsReference) GetLastFile() LastFile {
 	}
 }
 
-func (s *FolderStatisticsReference) ReceivedFile(file protocol.FileInfo) {
+func (s *FolderStatisticsReference) ReceivedFile(file string, deleted bool) {
 	if debug {
 		l.Debugln("stats.FolderStatisticsReference.ReceivedFile:", s.folder, file)
 	}
 	s.ns.PutTime("lastFileAt", time.Now())
-	s.ns.PutString("lastFileName", file.Name)
-	s.ns.PutBool("lastFileDeleted", file.IsDeleted())
+	s.ns.PutString("lastFileName", file)
+	s.ns.PutBool("lastFileDeleted", deleted)
 }
 
 func (s *FolderStatisticsReference) GetStatistics() FolderStatistics {