diff --git a/pantalaimon/daemon.py b/pantalaimon/daemon.py
index f695ef0..df32391 100755
--- a/pantalaimon/daemon.py
+++ b/pantalaimon/daemon.py
@@ -580,6 +580,8 @@ class ProxyDaemon:
         )
 
         if password == "":
+            if device_id is None:
+                raise ValueError("Empty password provided, but device_id was also None")
             # If password is blank, we cannot login normally and must
             # fall back to using the provided device_id.
             pan_client.restore_login(user_id, device_id, access_token)