diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29ea3821..a7b56560 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+- Replace `TOTP_NOT_ENABLED_ERROR` with other TOTP exceptions.
 - Support for MFA recipe
 
 ### Changes
diff --git a/src/main/java/io/supertokens/storage/postgresql/Start.java b/src/main/java/io/supertokens/storage/postgresql/Start.java
index beef2f02..da144a7d 100644
--- a/src/main/java/io/supertokens/storage/postgresql/Start.java
+++ b/src/main/java/io/supertokens/storage/postgresql/Start.java
@@ -70,7 +70,6 @@
 import io.supertokens.pluginInterface.totp.TOTPStorage;
 import io.supertokens.pluginInterface.totp.TOTPUsedCode;
 import io.supertokens.pluginInterface.totp.exception.DeviceAlreadyExistsException;
-import io.supertokens.pluginInterface.totp.exception.TotpNotEnabledException;
 import io.supertokens.pluginInterface.totp.exception.UnknownDeviceException;
 import io.supertokens.pluginInterface.totp.exception.UsedCodeAlreadyExistsException;
 import io.supertokens.pluginInterface.totp.sqlStorage.TOTPSQLStorage;
@@ -2725,7 +2724,7 @@ public TOTPDevice[] getDevices_Transaction(TransactionConnection con, AppIdentif
     @Override
     public void insertUsedCode_Transaction(TransactionConnection con, TenantIdentifier tenantIdentifier,
                                            TOTPUsedCode usedCodeObj)
-            throws StorageQueryException, TotpNotEnabledException, UsedCodeAlreadyExistsException,
+            throws StorageQueryException, UnknownDeviceException, UsedCodeAlreadyExistsException,
             TenantOrAppNotFoundException {
         Connection sqlCon = (Connection) con.getConnection();
         try {
@@ -2737,7 +2736,7 @@ public void insertUsedCode_Transaction(TransactionConnection con, TenantIdentifi
                 throw new UsedCodeAlreadyExistsException();
             } else if (isForeignKeyConstraintError(err, Config.getConfig(this).getTotpUsedCodesTable(),
                     "user_id")) {
-                throw new TotpNotEnabledException();
+                throw new UnknownDeviceException();
             } else if (isForeignKeyConstraintError(err, Config.getConfig(this).getTotpUsedCodesTable(), "tenant_id")) {
                 throw new TenantOrAppNotFoundException(tenantIdentifier);
             }
diff --git a/src/test/java/io/supertokens/storage/postgresql/test/DeadlockTest.java b/src/test/java/io/supertokens/storage/postgresql/test/DeadlockTest.java
index deb32f0c..55aafea2 100644
--- a/src/test/java/io/supertokens/storage/postgresql/test/DeadlockTest.java
+++ b/src/test/java/io/supertokens/storage/postgresql/test/DeadlockTest.java
@@ -30,7 +30,7 @@
 import io.supertokens.pluginInterface.sqlStorage.SQLStorage.TransactionIsolationLevel;
 import io.supertokens.pluginInterface.totp.TOTPDevice;
 import io.supertokens.pluginInterface.totp.TOTPUsedCode;
-import io.supertokens.pluginInterface.totp.exception.TotpNotEnabledException;
+import io.supertokens.pluginInterface.totp.exception.UnknownDeviceException;
 import io.supertokens.pluginInterface.totp.exception.UsedCodeAlreadyExistsException;
 import io.supertokens.pluginInterface.totp.sqlStorage.TOTPSQLStorage;
 import io.supertokens.storageLayer.StorageLayer;
@@ -266,7 +266,7 @@ public void testConcurrentDeleteAndUpdate() throws Exception {
             try {
                 totpStorage.insertUsedCode_Transaction(con, new TenantIdentifier(null, null, null), code);
                 totpStorage.commitTransaction(con);
-            } catch (TotpNotEnabledException | UsedCodeAlreadyExistsException e) {
+            } catch (UnknownDeviceException | UsedCodeAlreadyExistsException e) {
                 // This should not happen
                 throw new StorageTransactionLogicException(e);
             } catch (TenantOrAppNotFoundException e) {
@@ -428,7 +428,7 @@ public void testConcurrentDeleteAndInsert() throws Exception {
             try {
                 totpStorage.insertUsedCode_Transaction(con, new TenantIdentifier(null, null, null), code);
                 totpStorage.commitTransaction(con);
-            } catch (TotpNotEnabledException | UsedCodeAlreadyExistsException e) {
+            } catch (UnknownDeviceException | UsedCodeAlreadyExistsException e) {
                 // This should not happen
                 throw new StorageTransactionLogicException(e);
             } catch (TenantOrAppNotFoundException e) {
@@ -531,7 +531,7 @@ public void testConcurrentDeleteAndInsert() throws Exception {
                     TOTPUsedCode code2 = new TOTPUsedCode("user", "1234", false, nextDay, now + 1);
                     try {
                         totpStorage.insertUsedCode_Transaction(con, new TenantIdentifier(null, null, null), code2);
-                    } catch (TotpNotEnabledException | UsedCodeAlreadyExistsException e) {
+                    } catch (UnknownDeviceException | UsedCodeAlreadyExistsException e) {
                         // This should not happen
                         throw new StorageTransactionLogicException(e);
                     } catch (TenantOrAppNotFoundException e) {
@@ -546,7 +546,7 @@ public void testConcurrentDeleteAndInsert() throws Exception {
             } catch (StorageTransactionLogicException e) {
                 Exception e2 = e.actualException;
 
-                if (e2 instanceof TotpNotEnabledException) {
+                if (e2 instanceof UnknownDeviceException) {
                     t2Failed.set(true);
                 }
             } catch (StorageQueryException e) {
diff --git a/src/test/java/io/supertokens/storage/postgresql/test/StorageLayerTest.java b/src/test/java/io/supertokens/storage/postgresql/test/StorageLayerTest.java
index 7f39a6ca..87d9d992 100644
--- a/src/test/java/io/supertokens/storage/postgresql/test/StorageLayerTest.java
+++ b/src/test/java/io/supertokens/storage/postgresql/test/StorageLayerTest.java
@@ -9,7 +9,7 @@
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
 import io.supertokens.pluginInterface.totp.TOTPDevice;
 import io.supertokens.pluginInterface.totp.TOTPUsedCode;
-import io.supertokens.pluginInterface.totp.exception.TotpNotEnabledException;
+import io.supertokens.pluginInterface.totp.exception.UnknownDeviceException;
 import io.supertokens.pluginInterface.totp.exception.UsedCodeAlreadyExistsException;
 import io.supertokens.pluginInterface.totp.sqlStorage.TOTPSQLStorage;
 import io.supertokens.storageLayer.StorageLayer;
@@ -46,7 +46,7 @@ public static void insertUsedCodeUtil(TOTPSQLStorage storage, TOTPUsedCode usedC
                     storage.insertUsedCode_Transaction(con, new TenantIdentifier(null, null, null), usedCode);
                     storage.commitTransaction(con);
                     return null;
-                } catch (TotpNotEnabledException | UsedCodeAlreadyExistsException e) {
+                } catch (UnknownDeviceException | UsedCodeAlreadyExistsException e) {
                     throw new StorageTransactionLogicException(e);
                 } catch (TenantOrAppNotFoundException e) {
                     throw new IllegalStateException(e);
@@ -54,7 +54,7 @@ public static void insertUsedCodeUtil(TOTPSQLStorage storage, TOTPUsedCode usedC
             });
         } catch (StorageTransactionLogicException e) {
             Exception actual = e.actualException;
-            if (actual instanceof TotpNotEnabledException || actual instanceof UsedCodeAlreadyExistsException) {
+            if (actual instanceof UnknownDeviceException || actual instanceof UsedCodeAlreadyExistsException) {
                 throw actual;
             } else {
                 throw e;