diff --git a/hypr-configs/hyprland/hypr/configs/autostart.conf b/hypr-configs/hyprland/hypr/configs/autostart.conf
index 13ee62c..0f4295f 100644
--- a/hypr-configs/hyprland/hypr/configs/autostart.conf
+++ b/hypr-configs/hyprland/hypr/configs/autostart.conf
@@ -3,7 +3,7 @@
 # -----------------------------------------------------
 
 exec-once = dbus-update-activation-environment --all &
-exec-once = $SCRIPT_PATH/startup/pipewire.sh &
+# exec-once = $SCRIPT_PATH/startup/pipewire.sh &
 exec-once = $SCRIPT_PATH/startup/keyring.sh &
 exec-once = wl-paste --watch cliphist store &
 
diff --git a/setup.sh b/setup.sh
index ce32922..8e47f28 100755
--- a/setup.sh
+++ b/setup.sh
@@ -103,6 +103,18 @@ enable_services() {
     log "Services enabled"
 }
 
+enable_pipewire() {
+    log "Enable Pipewire"
+
+    sudo ln -s /usr/share/applications/pipewire.desktop /etc/xdg/autostart
+
+    sudo ln -s /usr/share/applications/pipewire-pulse.desktop /etc/xdg/autostart
+
+    sudo ln -s /usr/share/applications/wireplumber.desktop /etc/xdg/autostart
+
+    log "pipewire enabled"
+}
+
 disable_grub_menu() {
     if [ $DISABLE_GRUB_MENU = true ]; then
         log "Disable grub menu"
@@ -134,6 +146,7 @@ while getopts "sfh" opt; do
         install_pkgs
         add_user_to_groups
         enable_services
+        enable_pipewire
         disable_grub_menu
 
         log "Setup is done, please log out and log in"