diff --git a/fhem/CHANGED b/fhem/CHANGED
index 6c93ff254..4a7eed73d 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,6 +1,7 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
 
+  - bugfix: 74_AMAD: fix FHEM crash when use AMAD and apptime togehter
   - new: 98_TRAFFIC: provide traffic details with Google Distance API
   - feature: 98_Hyperion: set configFile only available if at least two files
                           are found while get configFiles
diff --git a/fhem/FHEM/74_AMAD.pm b/fhem/FHEM/74_AMAD.pm
index d7ec41547..4f5a0745d 100644
--- a/fhem/FHEM/74_AMAD.pm
+++ b/fhem/FHEM/74_AMAD.pm
@@ -37,7 +37,7 @@ use TcpServerUtils;
 use Encode qw(encode);
 
 
-my $modulversion = "2.6.3";
+my $modulversion = "2.6.4";
 my $flowsetversion = "2.6.4";
 
 
@@ -139,8 +139,8 @@ sub AMAD_Undef($$) {
 
     my ( $hash, $arg ) = @_;
     
-    if( $hash->{BRIDGE} ) {
-	delete $modules{AMAD}{defptr}{BRIDGE} if(defined($modules{AMAD}{defptr}{BRIDGE}));
+    if( $hash->{BRIDGE} or $hash->{TEMPORARY} == 1 ) {
+	delete $modules{AMAD}{defptr}{BRIDGE} if( defined($modules{AMAD}{defptr}{BRIDGE}) and $hash->{BRIDGE} );
 	TcpServer_Close( $hash );
     } 
     
@@ -259,7 +259,7 @@ sub AMAD_Attr(@) {
 
 sub AMAD_GetUpdate($) {
 
-my ( $hash ) = @_;
+    my ( $hash ) = @_;
     my $name = $hash->{NAME};
     my $bhash = $modules{AMAD}{defptr}{BRIDGE};
     my $bname = $bhash->{NAME};