diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py
index a9185da8..3dfec639 100644
--- a/.bin/Scripts/system_setup.py
+++ b/.bin/Scripts/system_setup.py
@@ -201,10 +201,14 @@ def get_answers(setup_mode):
 
   if answers['Fast-Hiber'] is None:
     if global_vars['OS']['Version'] == '10':
-      print_standard(' ')
-      print_standard('Disable Fast Startup and enable Hibernation?')
-      print_standard('    Recommended for SSDs, optional for HDDs')
-      answers['Fast-Hiber'] = ask('    Proceed?')
+      # SSD check
+      if drive_is_rotational(global_vars['Env']['SYSTEMDRIVE']):
+        answers['Fast-Hiber'] = True
+      else:
+        print_standard(' ')
+        print_standard('Disable Fast Startup and enable Hibernation?')
+        print_standard('    Recommended for SSDs, optional for HDDs')
+        answers['Fast-Hiber'] = ask('    Proceed?')
     else:
       answers['Fast-Hiber'] = False