diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup
index 7bf82725af..27161731af 100755
--- a/dist/common/scripts/scylla_setup
+++ b/dist/common/scripts/scylla_setup
@@ -311,7 +311,7 @@ if __name__ == '__main__':
         raid_setup = interactive_ask_service('Are you sure you want to setup RAID0 and XFS?', 'If you choose Yes, the selected drive will be reformated, erasing all existing data in the process.', raid_setup)
     else:
         raid_setup = False
-    if res and raid_setup:
+    if res and raid_setup and not disks:
         devices = get_unused_disks()
         if len(devices) == 0:
             print('No free disks were detected, abort RAID/XFS setup. Disks must be unmounted before proceeding.\n')