diff --git a/Riot/Modules/Authentication/Views/AuthInputsView.m b/Riot/Modules/Authentication/Views/AuthInputsView.m
index eaaedd46b..4e8d32116 100644
--- a/Riot/Modules/Authentication/Views/AuthInputsView.m
+++ b/Riot/Modules/Authentication/Views/AuthInputsView.m
@@ -604,7 +604,7 @@
                         restClient = [self.delegate authInputsViewThirdPartyIdValidationRestClient:self];
                     }
                     
-                    if (restClient)
+                    if (restClient && restClient.identityServer)
                     {
                         // Check whether a second 3pid is available
                         _isThirdPartyIdentifierPending = (nbPhoneNumber && ![self isFlowCompleted:kMXLoginFlowTypeMSISDN]);