diff --git a/bubble-server/src/main/java/bubble/dao/device/DeviceDAO.java b/bubble-server/src/main/java/bubble/dao/device/DeviceDAO.java
index c11e89b3..40fbe461 100644
--- a/bubble-server/src/main/java/bubble/dao/device/DeviceDAO.java
+++ b/bubble-server/src/main/java/bubble/dao/device/DeviceDAO.java
@@ -76,6 +76,9 @@ public class DeviceDAO extends AccountOwnedEntityDAO<Device> {
         if (current != null && current.uninitialized()) {
             device.initTotpKey();
         }
+        if (device.getDeviceType() == null || device.getDeviceType() == BubbleDeviceType.uninitialized) {
+            device.setDeviceType(BubbleDeviceType.other);
+        }
         final Device updated = super.update(device);
         ensureSpareDevice(device.getAccount(), device.getNetwork(), true);
         return updated;