diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 1e511abe7..aec2a4639 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -348,7 +348,7 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
             return $statementColumnMap[$alias];
         }
 
-        $prefixedAlias = $table . '.' . $alias;
+        $prefixedAlias = $this->removeTablePrefix($table) . '.' . $alias;
         if (isset($statementColumnMap[$prefixedAlias])) {
             return $statementColumnMap[$prefixedAlias];
         }