diff --git a/keepassxc-browser/content/totp-field.js b/keepassxc-browser/content/totp-field.js
index d4e9a07..8f49d5b 100644
--- a/keepassxc-browser/content/totp-field.js
+++ b/keepassxc-browser/content/totp-field.js
@@ -106,7 +106,17 @@ class TOTPFieldIcon extends Icon {
 
 // Fill TOTP automatically if option is enabled
 TOTPFieldIcon.prototype.autoFillSingleTotp = async function(field) {
-    if (kpxc.settings.autoFillSingleTotp) {
+    // Check for site preference overrides
+    const sitePreference = kpxc.retrieveSitePreference();
+    let autoFillSingleTotpSitePreference = false;
+    if (sitePreference !== null && sitePreference !== undefined) {
+      if (sitePreference.autoFillTOTP === true || sitePreference.autoFillTOTP === false) {
+        autoFillSingleTotpSitePreference = sitePreference.autoFillTOTP;
+      }
+    }
+
+
+    if (kpxc.settings.autoFillSingleTotp || autoFillSingleTotpSitePreference) {
         if (kpxc.credentials.length === 0) {
             await kpxc.receiveCredentialsIfNecessary();
         }