diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index d3e6989e7d..243d520aa7 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -176,7 +176,7 @@ export default class AutofillService implements AutofillServiceInterface {
             }, { frameId: pd.frameId });
 
             if (options.cipher.type !== CipherType.Login || totpPromise || options.skipTotp ||
-                !options.cipher.login.totp || !canAccessPremium) {
+                !options.cipher.login.totp || (!canAccessPremium && !options.cipher.organizationUseTotp)) {
                 return;
             }