diff --git a/client_software/0020_nextcloud_desktopclient/user_run.sh b/client_software/0020_nextcloud_desktopclient/user_run.sh
index 58185f0..7e3e59a 100755
--- a/client_software/0020_nextcloud_desktopclient/user_run.sh
+++ b/client_software/0020_nextcloud_desktopclient/user_run.sh
@@ -26,8 +26,9 @@ fi
 NC_PID=$( pgrep -u $USER nextcloud )
 if [[ ! -z ${NC_PID} ]]; then
     echo "Stopping Nextcloud with PID ${NC_PID}"
-#    $BASECMD --quit 1>/dev/null 2>/dev/null && sleep 2
-    kill ${NC_PID}
+    # Kill does not remove lockfiles in ~/.var/app/com.nextcloud.desktopclient.nextcloud/cache/tmp/ which will prevent next start
+    # kill ${NC_PID} && sleep 2
+    /usr/bin/flatpak run --branch=stable --arch=x86_64 --command=nextcloud com.nextcloud.desktopclient.nextcloud --quit && sleep 2
     if [[ $? -ne 0 ]]; then
       echo "Service could not be stopped, please check why."
       exit 1
@@ -109,7 +110,7 @@ done
 #fi
 # Now start Nextcloud
 echo "Starting Nextcloud Client in Background"
-/usr/bin/setsid ${BASECMD} --background >${TEMPDIR}/nc_desktop_client.log 2>&1 &
-sleep 5
+/usr/bin/setsid ${BASECMD} >${TEMPDIR}/nc_desktop_client.log 2>&1 &
+sleep 2
 echo "Done Setup of Nextcloud."
 exit 0