diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
index 2e1cd135e4e42fdd348e70f79c6ef07222d09e4f..09958723e64d0a59d03189fbf153d5a2d36bb4a0 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
@@ -36,6 +36,7 @@ import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
 
 import com.journeyapps.barcodescanner.ScanIntentResult
+import jp.atled.agileworks.model.LoginRepository
 
 
 class LoginFragment: Fragment() {
@@ -135,7 +136,9 @@ class LoginFragment: Fragment() {
                     requireActivity().runOnUiThread {
                         setCertificate(it)
                     }
-                    ApiClient.reCreate()
+                    if (LoginRepository().loadServerUrl().isNotEmpty() && LoginRepository().loadServerContext().isNotEmpty()){
+                        ApiClient.reCreate()
+                    }
                 }
             }
         }