diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index 62cfd0c..5479d5f 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -206,7 +206,7 @@ void ExecSyncMcuRtc()
 // Zero NUP限定コード
 bool NeedsNup()
 {
-    if(AlreadyExecutedNup())
+    if(AlreadyExecutedNup() || s_NupOnlyMode)
     {
         return !common::ExistsUpdateCheckedFile();
     }
@@ -235,11 +235,11 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
             if (nn::fs::IsSdmcInserted())
             {
                 CheckAndReadVersionData(operationMessage);
+                validApSetting = CheckAndReadAPSetting(operationMessage);
 
                 // NUPが必要か？
                 if (!NeedsNup())
                 {
-                    validApSetting = CheckAndReadAPSetting(operationMessage);
                     if (s_NupOnlyMode)
                     {
                         s_RestoreState = NUP_ONLY_WAIT_SD_EJECT;
@@ -336,7 +336,7 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
                 }
                 else
                 {
-                    if (CheckAndReadAPSetting(operationMessage))
+                    if (validApSetting)
                     {
                         // ネットワークアップデートを行う
                         needsUpdate = true;