diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index 12bed396..a734cb16 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -170,6 +170,10 @@ function reconfigure_tahoelafs {
 }
 
 function remove_tahoelafs {
+    systemctl stop tahoelafs
+    systemctl disable tahoelafs
+    rm /etc/systemd/system/tahoelafs.service
+
     firewall_remove ${TAHOELAFS_PORT}
     rm -rf /var/lib/tahoelafs
     remove_completion_param install_tahoelafs
@@ -177,6 +181,9 @@ function remove_tahoelafs {
     function_check remove_onion_service
     remove_onion_service tahoelafs ${TAHOELAFS_ONION_PORT}
     deluser tahoelafs
+    if [ -d /home/tahoelafs ]; then
+        rm -rf /home/tahoelafs
+    fi
     remove_app tahoelafs
 }