diff --git a/hosts/isshin/configuration.nix b/hosts/isshin/configuration.nix
index eb83054..6d0479c 100644
--- a/hosts/isshin/configuration.nix
+++ b/hosts/isshin/configuration.nix
@@ -6,7 +6,6 @@
   hosts.laptop.enable = true;
 
   # Eanble fingerprint for framework laptop
-  fingerprint.enable = true;
   hosts.amd.enable = true;
 
   # Fix 6GHz problem
diff --git a/hosts/yhwach/configuration.nix b/hosts/yhwach/configuration.nix
index af9938a..4ef7041 100644
--- a/hosts/yhwach/configuration.nix
+++ b/hosts/yhwach/configuration.nix
@@ -18,9 +18,4 @@
 
   # Set system time
   time.hardwareClockInLocalTime = true;
-
-  # cosmic.enable = true;
-
-  # Eanble fingerprint for framework laptop
-  # fingerprint.enable = true;
 }
diff --git a/modules/nixos/security/default.nix b/modules/nixos/security/default.nix
index bbca60e..5400e2d 100644
--- a/modules/nixos/security/default.nix
+++ b/modules/nixos/security/default.nix
@@ -13,7 +13,7 @@
     ./yubikey
   ];
 
-  fingerprint.enable = lib.mkDefault false;
+  facter.detected.fingerprint.enable = lib.mkOverride 2000 false;
   rssh.enable = lib.mkDefault (!config.yubikey.enable && config.ssh.enable);
   secrets.enable = lib.mkDefault true;
   tpm.enable = lib.mkOptionDefault false;
diff --git a/modules/nixos/security/fingerprint.nix b/modules/nixos/security/fingerprint.nix
index deff383..feb6344 100644
--- a/modules/nixos/security/fingerprint.nix
+++ b/modules/nixos/security/fingerprint.nix
@@ -5,7 +5,9 @@
   ...
 }:
 {
-  options.fingerprint.enable = lib.mkEnableOption "Enable fingerprint scanner support";
+  options.fingerprint.enable = lib.mkEnableOption "Enable fingerprint scanner support" // {
+    default = config.facter.detected.fingerprint.enable;
+  };
 
   config = lib.mkIf config.fingerprint.enable {
     # Enable fingerprint support with goodix (framework)