diff --git a/fhem/FHEM/39_alexa.pm b/fhem/FHEM/39_alexa.pm
index 1038268e5..1e6535eda 100644
--- a/fhem/FHEM/39_alexa.pm
+++ b/fhem/FHEM/39_alexa.pm
@@ -878,6 +878,17 @@ alexa_Set($$@)
 
     FW_directNotify($name, 'clearProxyCredentials');
 
+    return undef;
+
+  } elsif( $cmd eq 'unregister' ) {
+    FW_directNotify($name, 'unregister');
+
+    fhem( "set $name clearProxyCredentials" );
+
+    CommandAttr( undef, '$name disable 1' );
+
+    CommandSave(undef,undef) if( AttrVal( "autocreate", "autosave", 1 ) );
+
     return undef;
   }