diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
index ce5175d2a..d7ceafd90 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
@@ -231,7 +231,8 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
         if(groupInfo.isGroupOwner)  fileReceiverDeviceAddress = selectedPeerDeviceInetAddress;
         else                        fileReceiverDeviceAddress = groupInfo.groupOwnerAddress;
 
-        //TODO: Fix this
+        // Hack for allowing slower receiver devices to setup server before sender device requests to connect
+        showToast(localFileTransferActivity, R.string.preparing_files, Toast.LENGTH_LONG);
         for(int i = 0; i < 20000000; i++);
 
         for(int i = 0; i < totalFilesForTransfer; i++) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 613a5b0c7..c003e3ea8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -288,7 +288,8 @@
   <string name="device_status">Device Status</string>
   <string name="your_device">Your Device:</string>
   <string name="nearby_devices">NEARBY DEVICES</string>
-  <string name="no_devices_found">No devices detected. Tap on search button to try again</string>
+  <string name="no_devices_found">No devices detected. Tap on search button to try again.</string>
   <string name="files_for_transfer">FILES FOR TRANSFER</string>
   <string name="file_name">File Name</string>
+  <string name="preparing_files">Preparing files for transfer...</string>
 </resources>