diff --git a/includes/class-instawp-hooks.php b/includes/class-instawp-hooks.php
index b2a3edf6..8be125c3 100644
--- a/includes/class-instawp-hooks.php
+++ b/includes/class-instawp-hooks.php
@@ -53,7 +53,7 @@ public function handle_connection_state() {
 
 		public function handle_migration_through_wp( $wp ) {
 			if ( isset( $wp->query_vars['instawp_serve'] ) ) {
-				$serve_file = INSTAWP_PLUGIN_DIR . 'serve.php';
+				$serve_file = INSTAWP_PLUGIN_DIR . 'iwp-serve/index.php';
 
 				if ( file_exists( $serve_file ) ) {
 					// Prevent WordPress from loading further
diff --git a/includes/class-instawp-tools.php b/includes/class-instawp-tools.php
index 2dc1624f..673336bd 100644
--- a/includes/class-instawp-tools.php
+++ b/includes/class-instawp-tools.php
@@ -1456,10 +1456,12 @@ public static function get_serve_url( $serve_url = '' ) {
 
 		$accessible_file = empty( $res['serve_url'] ) ? array() : self::is_migrate_file_accessible( $res['serve_url'], true );
 		// Check accessibility of proxy serve url
-		if ( empty( $res['serve_url'] ) || empty( $accessible_file ) || ( ! $accessible_file['is_accessible'] && ! $accessible_file['error'] ) ) {
+		if ( empty( $res['serve_url'] ) || empty( $accessible_file ) || ! $accessible_file['is_accessible'] ) {
 			// Serve through WordPress
-			$res['serve_url']     = Helper::wp_site_url( 'serve-instawp/', true );
-			$res['serve_with_wp'] = true;
+			$res['serve_url'] = Helper::wp_site_url( 'serve-instawp/', true );
+			if ( self::is_migrate_file_accessible( $res['serve_url'] ) ) {
+				$res['serve_with_wp'] = true;
+			}
 		}
 
 		return $res;