diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 07193ed..93617d2 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -517,8 +517,7 @@ void ShopOperationSingleTemplate(
     // アップデートを行う
     if (!s_ShopOperationExecuted[op])
     {
-        // IVS取得モードの時は国設定を行う
-        if (!s_GetIvsOnlyMode || (s_GetIvsOnlyMode && ImportCountryLanguageData().IsSuccess()))
+        if (ImportCountryLanguageData().IsSuccess())
         {
             StartShopOperationSingle(op);
             s_ShopOperationExecuted[op] = true;
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 0cf6d6e..6ee3cc8 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -390,6 +390,12 @@ nn::Result ImportCountryLanguageData()
 {
     nn::Result result = nn::ResultSuccess();
 
+    // 設定済みなら何もしない
+    if(nn::cfg::CTR::GetCountry() != nn::cfg::CTR::CFG_COUNTRY_UNDEFINED)
+    {
+        return result;
+    }
+
     if (common::ExistsCountryLanguageFile())
     {
         size_t bufSize = 1024;