diff --git a/src/Modules/Application/Model/d3_dev_oxorder.php b/src/Modules/Application/Model/d3_dev_oxorder.php
index 20eabf5..8338832 100644
--- a/src/Modules/Application/Model/d3_dev_oxorder.php
+++ b/src/Modules/Application/Model/d3_dev_oxorder.php
@@ -63,7 +63,10 @@ class d3_dev_oxorder extends d3_dev_oxorder_parent
         }
         $parameters = [$orderNr];
 
-        $sSelect = "SELECT oxid FROM ".oxNew(Order::class)->getViewName()." WHERE ".$sWhere." ORDER BY oxorderdate DESC LIMIT 1";
+        $sSelect = "SELECT oxid FROM ".oxNew(Order::class)->getViewName()." WHERE ".
+            "oxuserid != '' AND ".
+            "oxshopid = ".Registry::getConfig()->getShopId()." AND ".
+            $sWhere." ORDER BY oxorderdate DESC LIMIT 1";
 
         return DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->getOne($sSelect, $parameters);
     }