diff --git a/obuspa/files/etc/init.d/obuspa b/obuspa/files/etc/init.d/obuspa
index 85e5ddb1e..fb66a6b97 100755
--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -6,7 +6,7 @@ USE_PROCD=1
 
 PROG=/usr/sbin/obuspa
 CONFIGURATION=obuspa
-
+FIRST_BOOT="/etc/obuspa/boot_marker"
 ENV_PROFILE="/root/.profile"
 KEEP_FILE="/lib/upgrade/keep.d/obuspa"
 
@@ -871,6 +871,12 @@ sync_uci_with_db()
 		return 0;
 	fi
 
+	# Skip overriding uci in case of Firstboot
+	if [ ! -f "${FIRST_BOOT}" ]; then
+		return 0
+	fi
+
+	log "Syncing obuspa uci with usp.db ...."
 	config_load obuspa
 	sync_db_controller
 	sync_db_localagent_mtp
@@ -978,7 +984,6 @@ db_init()
 		# Only do this if db have reasonable data
 		val="$(awk 'END{print NR}' ${DB_DUMP})"
 		if [ "$val" -gt 15 ]; then
-			log "Syncing obuspa uci with usp.db ...."
 			sync_uci_with_db
 		fi
 	fi
@@ -1026,6 +1031,7 @@ db_init()
 		cat ${CTRUST_RESET_FILE} >> ${RESET_FILE}
 		rm ${CTRUST_RESET_FILE}
 	fi
+	[ -f "${FIRST_BOOT}" ] || touch "${FIRST_BOOT}"
 }
 
 start_service() {
@@ -1043,7 +1049,6 @@ start_service() {
 		procd_set_param respawn \
 			"${respawn_threshold:-10}" \
 			"${respawn_timeout:-10}" "${respawn_retry:-5}"
-		#procd_set_param limits core="unlimited"
 	fi
 	procd_close_instance ${CONFIGURATION}
 }