diff --git a/src/Lib/Activity.php b/src/Lib/Activity.php
index 0b058b909..3c3dbc340 100644
--- a/src/Lib/Activity.php
+++ b/src/Lib/Activity.php
@@ -1663,13 +1663,13 @@ class Activity
         $channel = ((array_key_exists('channel_id', $p)) ? $p : Channel::from_hash($p['xchan_hash']));
 
         if ($channel) {
+            if (!$extended) {
+                return Channel::getDidResolver($channel, true);
+            }
             $nomadic = (int)PConfig::Get($channel['channel_id'], 'system', 'nomadicAP');
             if ($legacy) {
                 $nomadic = false;
             }
-            if ($nomadic && !$extended) {
-                return Channel::getDidResolver($channel, true);
-            }
             if ($export) {
                 $nomadic = true;
             }