diff --git a/src/moin/storage/middleware/indexing.py b/src/moin/storage/middleware/indexing.py
index d5d6451b3..f9d8f9503 100644
--- a/src/moin/storage/middleware/indexing.py
+++ b/src/moin/storage/middleware/indexing.py
@@ -232,13 +232,11 @@ def convert_to_indexable(meta, data, item_name=None, is_new=False):
                    metadata as a side effect
     :returns: indexable content, text/plain, unicode object
     """
-    if not item_name:
+    if not item_name or (item_name and meta.get(NAMESPACE)):
         try:
             item_name = meta[NAMESPACE] + "/" + meta[NAME][0]
         except IndexError:
             item_name = meta[NAMESPACE] + "/" + "DoesNotExist"
-    elif item_name and meta.get(NAMESPACE):
-        item_name = meta[NAMESPACE] + "/" + meta[NAME][0]
     fqname = split_fqname(item_name)
 
     class PseudoRev: