diff --git a/lib/ClientRegistration.php b/lib/ClientRegistration.php
index 70d9f93..bc28b5d 100644
--- a/lib/ClientRegistration.php
+++ b/lib/ClientRegistration.php
@@ -24,6 +24,14 @@ public static function getRegistration($clientId)
 			if (!isset($clientData['origin']) && isset($clientData['client_uri'])) {
 				$clientData['origin'] = rtrim($clientData['client_uri'], '/');
 			}
+			if (!isset($clientData['origin'])) {
+				$parsedOrigin = parse_url($clientId);
+				$origin = $parsedOrigin['scheme'] . '://' . $parsedOrigin['host'];
+				if (isset($parsedOrigin['port'])) {
+					$origin .= ":" . $parsedOrigin['port'];
+				}
+				$clientData['origin'] = $origin;
+			}
 			self::saveClientRegistration($clientData);
 			return $clientData;
 		}