diff --git a/app/Models/TwoFAccount.php b/app/Models/TwoFAccount.php
index bcd2b05e..ca3602e9 100644
--- a/app/Models/TwoFAccount.php
+++ b/app/Models/TwoFAccount.php
@@ -313,8 +313,9 @@ public function setCounterAttribute($value)
      * 
      * @throws InvalidSecretException The secret is not a valid base32 encoded string
      * @throws UndecipherableException The secret cannot be deciphered
+     * @return TotpDto|HotpDto 
      */
-    public function getOTP() : TotpDto|HotpDto
+    public function getOTP()
     {
         Log::info(sprintf('OTP requested for TwoFAccount #%s', $this->id));
 
@@ -461,7 +462,7 @@ private function enforceAsSteam()
      */
     private function getGeneratorOtpType()
     {
-        return Arr::get($this->generatorClassMap, $this->generator::class);
+        return Arr::get($this->generatorClassMap, get_class($this->generator));
     }
 
     /**