diff --git a/store/sqlstore/file_info_store.go b/store/sqlstore/file_info_store.go
index 682db165e4..b9eb515992 100644
--- a/store/sqlstore/file_info_store.go
+++ b/store/sqlstore/file_info_store.go
@@ -739,7 +739,7 @@ func (fs SqlFileInfoStore) GetFilesBatchForIndexing(startTime int64, startFileID
 
 func (fs SqlFileInfoStore) GetStorageUsage(allowFromCache, includeDeleted bool) (int64, error) {
 	query := fs.getQueryBuilder().
-		Select("SUM(Size)").
+		Select("COALESCE(SUM(Size), 0)").
 		From("FileInfo")
 
 	if !includeDeleted {
diff --git a/store/storetest/file_info_store.go b/store/storetest/file_info_store.go
index 467db6bc34..34cd2da114 100644
--- a/store/storetest/file_info_store.go
+++ b/store/storetest/file_info_store.go
@@ -730,6 +730,11 @@ func testFileInfoStoreCountAll(t *testing.T, ss store.Store) {
 func testFileInfoGetStorageUsage(t *testing.T, ss store.Store) {
 	_, err := ss.FileInfo().PermanentDeleteBatch(model.GetMillis(), 100000)
 	require.NoError(t, err)
+
+	usage, err := ss.FileInfo().GetStorageUsage(false, false)
+	require.NoError(t, err)
+	require.Equal(t, int64(0), usage)
+
 	f1, err := ss.FileInfo().Save(&model.FileInfo{
 		PostId:    model.NewId(),
 		CreatorId: model.NewId(),
@@ -753,7 +758,7 @@ func testFileInfoGetStorageUsage(t *testing.T, ss store.Store) {
 	})
 	require.NoError(t, err)
 
-	usage, err := ss.FileInfo().GetStorageUsage(false, false)
+	usage, err = ss.FileInfo().GetStorageUsage(false, false)
 	require.NoError(t, err)
 	require.Equal(t, int64(30), usage)