diff --git a/app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/HotspotService.java b/app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/HotspotService.java
index 02ba9c83c..d20fc3b89 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/HotspotService.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/HotspotService.java
@@ -64,14 +64,6 @@ public class HotspotService extends Service {
     switch (intent.getAction()) {
       case ACTION_TURN_ON_BEFORE_O:
         if (hotspotManager.setWifiEnabled(null, true)) {
-          //final Handler handler = new Handler();
-          //handler.postDelayed(new Runnable() {
-          //  @Override
-          //  public void run() {
-          //    startServerDialog();
-          //  }
-          //}, 6000);
-
           startHotspotDetails();
           updateNotification(getString(R.string.hotspot_running), true);
         }
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/WifiHotspotManager.java b/app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/WifiHotspotManager.java
index 4f2c87fd9..6bc504e37 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/WifiHotspotManager.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/WifiHotspotManager.java
@@ -154,9 +154,22 @@ public class WifiHotspotManager {
 
     AlertDialog.Builder builder = new AlertDialog.Builder(context, dialogStyle());
 
-    builder.setPositiveButton(android.R.string.ok, (dialog, id) -> {
-      startServerDialog(context);
-    });
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      builder.setPositiveButton(android.R.string.ok, (dialog, id) -> {
+        startServerDialog(context);
+      });
+    } else {
+      builder.setPositiveButton(android.R.string.ok, (dialog, id) -> {
+        final Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+          @Override
+          public void run() {
+            startServerDialog(context);
+          }
+        }, 6000);
+      });
+    }
+
     builder.setTitle(context.getString(R.string.hotspot_turned_on));
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       builder.setMessage(