diff --git a/client_software/0010_kwallet/install.sh b/client_software/0010_kwallet/install.sh
index ad17fe6..3db5c89 100755
--- a/client_software/0010_kwallet/install.sh
+++ b/client_software/0010_kwallet/install.sh
@@ -28,6 +28,11 @@ if [ "${DAVTOKEN_USER}." == "." ]; then
     exit 1
 fi
 
+if [[ -z $(wmctrl -m | grep "KWin") ]]; then
+  # No KDE here - Cinnamon in Test
+  exit 0
+fi
+
 #Local Vars
 WALLETNAME="kdewallet"
 WALLETFILE="${WALLETNAME}.kwl"
diff --git a/client_software/0010_kwallet/user_run.sh b/client_software/0010_kwallet/user_run.sh
index 94622ad..bee7964 100755
--- a/client_software/0010_kwallet/user_run.sh
+++ b/client_software/0010_kwallet/user_run.sh
@@ -5,6 +5,11 @@
 WALLETAPPID="sys_config_wallet_script"
 WALLETNAME="kdewallet"
 
+if [[ -z $(wmctrl -m | grep "KWin") ]]; then
+  # No KDE here - Cinnamon in Test
+  exit 0
+fi
+
 #Restart the service
 nohup kwalletd6 >/dev/null 2>&1 &
 sleep 1