diff --git a/98_TadoAPI.pm b/98_TadoAPI.pm
index 8c30de7..5f6da0b 100644
--- a/98_TadoAPI.pm
+++ b/98_TadoAPI.pm
@@ -368,25 +368,6 @@ sub TadoAPI_Undefine($$) {
     return undef;
 }
 
-sub TadoAPI_OnlineStatus(@){
-  my ($hash) = @_;
-  my $name = $hash->{NAME};
-
-  # test api status
-  my $param = {
-      url        => $AuthURL,
-			timeout    => 5,
-			hash       => $hash,
-			method     => "GET",
-			header     => "",  
-		  callback   => \&TadoAPI_callback 
-		};
-  #test if api is reachable
-  HttpUtils_NonblockingGet($param);
-  
-  return undef;
-}
-
 sub TadoAPI_LoadToken(@){
   my ($hash) = @_;
   my $name = $hash->{NAME};
@@ -395,8 +376,6 @@ sub TadoAPI_LoadToken(@){
   $tokenLifeTime = 0 if(!defined $tokenLifeTime || $tokenLifeTime eq '');
   my $Token = undef;
 
-  TadoAPI_OnlineStatus($hash);
-
   if($apiStatus){
     eval {
       open(TOKENFILE, '<', $tokenFileName) or die("ERROR: $!");
@@ -415,8 +394,19 @@ sub TadoAPI_LoadToken(@){
     }
     close(TOKENFILE);
     return $Token if $Token;  
-    }
-return undef;
+  }
+
+  # test api status if no token could be loaded
+  my $param = {
+      url        => $AuthURL,
+			timeout    => 3,
+			hash       => $hash,
+			method     => "GET",
+		  callback   => \&TadoAPI_callback 
+		};
+  HttpUtils_NonblockingGet($param);
+
+  return undef;
 }
 
 sub TadoAPI_NewTokenRequest(@) {
@@ -428,6 +418,7 @@ sub TadoAPI_NewTokenRequest(@) {
 
   Log3 $name, 5, "TadoAPI $name" . ": " . "calling NewTokenRequest()";
 
+
   $data = {
     client_id => $client_id,
     client_secret => $client_secret,