diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index ddf472837..b17d319f6 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -601,6 +601,9 @@ def app_remove(auth, app):
 
     app_setting_path = apps_setting_path + app
 
+    if app_checkdefault(auth,app):
+        app_removedefault(auth, app)
+        
     #TODO: display fail messages from script
     try:
         shutil.rmtree('/tmp/yunohost_remove')