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 1cf01f5bf..41cb08f3a 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
@@ -565,6 +565,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
     protected void onPreExecute() {
       fileItemIndex = deviceListFragment.getTotalFilesSent();
 
+      //TODO: Remove runnable for onPreExecute, onPostExecute, onProgressUpdate
       deviceListFragment.getActivity().runOnUiThread(new Runnable() {
         @Override
         public void run() {
@@ -632,7 +633,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
       });
 
       if(deviceListFragment.allFilesSent()) {
-        deviceListFragment.getActivity().finish();
+        ((LocalFileTransferActivity) deviceListFragment.getActivity()).disconnect();
       }
     }
   }
@@ -713,7 +714,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
       super.onPostExecute(s);
       Toast.makeText(context, "File transfer complete", Toast.LENGTH_LONG).show();
       Log.d(LocalFileTransferActivity.TAG, "File transfer complete");
-      deviceListFragment.getActivity().finish();
+      ((LocalFileTransferActivity) deviceListFragment.getActivity()).disconnect();
 
       /*File recvFile = new File(filePath);
       Uri fileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID+".fileprovider",recvFile);
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
index d04e532fa..c2a46b836 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
@@ -613,3 +613,35 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
     this.finish();
   }
 }
+/*
+@Override
+  public void disconnect() {
+    fileSendingDevice = false;
+
+    //TODO
+    manager.removeGroup(channel, new DisconnectActionListener(this));
+    Toast.makeText(this, "Disconnecting devices...", Toast.LENGTH_LONG).show();
+
+
+  }
+
+  class DisconnectActionListener implements WifiP2pManager.ActionListener {
+
+    private LocalFileTransferActivity parentActivity;
+
+    public DisconnectActionListener(LocalFileTransferActivity parentActivity) {
+      this.parentActivity = parentActivity;
+    }
+
+    @Override
+    public void onSuccess() {
+      Log.d(TAG, "Disconnect successful");
+      parentActivity.finish();
+    }
+
+    @Override
+    public void onFailure(int reasonCode) {
+      Log.d(TAG, "Disconnect failed. Reason :" + reasonCode);
+    }
+  }
+  */