diff --git a/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm b/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
index 51af4347bc..457c238a53 100644
--- a/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
+++ b/lib/NGCP/Panel/Role/API/SubscriberRegistrations.pm
@@ -175,13 +175,18 @@ sub subscriber_from_id {
 sub _item_by_aor {
     my ($self, $c, $sub, $contact) = @_;
 
+    my $domain = $sub->provisioning_voip_subscriber->domain->domain;
+
     return $self->item_rs($c)->search({
         'me.contact'  => $contact,
         'me.username' => $sub->provisioning_voip_subscriber->username,
-        '-or' => [
-                'me.domain'   => $sub->provisioning_voip_subscriber->domain->domain,
-                'me.domain'   => undef,
-            ],
+        $c->config->{redis}->{usrloc}
+            ? ($c->config->{features}->{multidomain}
+                ? ('me.domain' => $domain)
+                : ())
+            : ($c->config->{features}->{multidomain}
+                ? ('me.domain' => $domain)
+                : ('me.domain' => undef))
     })->first;
 }