diff --git a/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/HistoryDao.kt b/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/HistoryDao.kt
index 7d6602227..2cf1e6176 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/HistoryDao.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/database/newdb/dao/HistoryDao.kt
@@ -45,7 +45,7 @@ class HistoryDao @Inject constructor(val box: Box<HistoryEntity>) {
   fun getHistoryList(showHistoryCurrentBook: Boolean) = box
     .query {
       if (showHistoryCurrentBook) {
-        equal(HistoryEntity_.zimFilePath, ZimContentProvider.getZimFile())
+        equal(HistoryEntity_.zimFilePath, ZimContentProvider.getZimFile() ?: "")
       }
       orderDesc(HistoryEntity_.timeStamp)
     }
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java
index 7a2baef8f..c67ea8cbc 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java
@@ -38,6 +38,7 @@ import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTra
 /**
  * Manager for the Wifi-P2p API, used in the local file transfer module
  */
+@SuppressWarnings("MissingPermission")
 public class WifiDirectManager
   implements WifiP2pManager.ChannelListener, WifiP2pManager.PeerListListener,
   WifiP2pManager.ConnectionInfoListener,