diff --git a/lib/views/filesharingview.dart b/lib/views/filesharingview.dart
index 9c517ad7..62fda176 100644
--- a/lib/views/filesharingview.dart
+++ b/lib/views/filesharingview.dart
@@ -37,7 +37,7 @@ class _FileSharingViewState extends State<FileSharingView> {
         future: Provider.of<FlwtchState>(context, listen: false).cwtch.GetSharedFiles(profileHandle, Provider.of<ContactInfoState>(context).identifier),
         builder: (context, snapshot) {
           if (snapshot.hasData) {
-            List<dynamic> sharedFiles = jsonDecode(snapshot.data as String);
+            List<dynamic> sharedFiles = jsonDecode(snapshot.data as String) ?? List<dynamic>.empty();
             sharedFiles.sort((a, b) {
               return a["DateShared"].toString().compareTo(b["DateShared"].toString());
             });