diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt
index 756c5edef..a8f427220 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt
@@ -39,9 +39,9 @@ class ServiceModule {
   @Provides
   @ServiceScope
   fun providesWebServerHelper(
-    kiwixServer: KiwixServer,
+    kiwixServerFactory: KiwixServer.Factory,
     ipAddressCallbacks: IpAddressCallbacks
-  ): WebServerHelper = WebServerHelper(kiwixServer, ipAddressCallbacks)
+  ): WebServerHelper = WebServerHelper(kiwixServerFactory, ipAddressCallbacks)
 
   @Provides
   @ServiceScope
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/KiwixServer.kt b/app/src/main/java/org/kiwix/kiwixmobile/webserver/KiwixServer.kt
index a8ca3e123..6457ddab6 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/KiwixServer.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/KiwixServer.kt
@@ -28,7 +28,7 @@ private const val TAG = "KiwixServer"
 
 class KiwixServer @Inject constructor(private val jniKiwixServer: JNIKiwixServer) {
 
-  class Factory {
+  class Factory @Inject constructor() {
     fun createKiwixServer(selectedBooksPath: ArrayList<String>): KiwixServer {
       val kiwixLibrary = Library()
       selectedBooksPath.forEach { path ->
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java
index 9953a9c08..b17322176 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/WebServerHelper.java
@@ -40,13 +40,14 @@ import static org.kiwix.kiwixmobile.core.utils.ServerUtils.INVALID_IP;
 public class WebServerHelper {
   private static final String TAG = "WebServerHelper";
   private KiwixServer kiwixServer;
+  private KiwixServer.Factory kiwixServerFactory;
   private IpAddressCallbacks ipAddressCallbacks;
   private boolean isServerStarted;
   private JNIKiwixServer server;
 
-  @Inject public WebServerHelper(@NonNull KiwixServer kiwixServer,
+  @Inject public WebServerHelper(@NonNull KiwixServer.Factory kiwixServerFactory,
     @NonNull IpAddressCallbacks ipAddressCallbacks) {
-    this.kiwixServer = kiwixServer;
+    this.kiwixServerFactory = kiwixServerFactory;
     this.ipAddressCallbacks = ipAddressCallbacks;
   }
 
@@ -71,8 +72,7 @@ public class WebServerHelper {
     if (!isServerStarted) {
       int DEFAULT_PORT = 8080;
       ServerUtils.port = DEFAULT_PORT;
-      KiwixServer.Factory factory = new KiwixServer.Factory();
-      kiwixServer = factory.createKiwixServer(selectedBooksPath);
+      kiwixServer = kiwixServerFactory.createKiwixServer(selectedBooksPath);
       updateServerState(kiwixServer.startServer(ServerUtils.port));
       Log.d(TAG, "Server status" + isServerStarted);
     }