diff --git a/_machines/notebook01.yml b/_machines/notebook01.yml
index 8aa3fe3..69da5b3 100644
--- a/_machines/notebook01.yml
+++ b/_machines/notebook01.yml
@@ -30,3 +30,4 @@ environment:
   MACHINE_HAS_KEEPASSX: "false"
   MACHINE_HAS_NEXTCLOUD: "true"
   MACHINE_HAS_RESTIC_BACKUP: "false"
+  MACHINE_HAS_SPOTIFY: "false"
diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml
index 1d452b5..68cdb11 100644
--- a/_machines/tb-hak.yml
+++ b/_machines/tb-hak.yml
@@ -42,3 +42,4 @@ environment:
   MACHINE_HAS_KEEPASSX: "true"
   MACHINE_HAS_NEXTCLOUD: "false"
   MACHINE_HAS_RESTIC_BACKUP: "true"
+  MACHINE_HAS_SPOTIFY: "true"
diff --git a/autostart/autostart.sh b/autostart/autostart.sh
index c2af295..2735ede 100755
--- a/autostart/autostart.sh
+++ b/autostart/autostart.sh
@@ -142,7 +142,9 @@ if [[ "${MACHINE_HAS_KEEPASSX}" == "true" ]] ; then
     run keepassx keepassx --keyfile ~/.secret/main.key ~/.secret/main.kdbx
 fi
 
-run spotify spotify
+if [[ "${MACHINE_HAS_SPOTIFY}" == "true" ]] ; then
+    run spotify spotify
+fi
 
 if [[ "${MACHINE_HAS_NEXTCLOUD}" == "true" ]] ; then
     run nextcloud nextcloud