Index: src/main/java/info/magnolia/cms/taglibs/BaseContentTag.java
===================================================================
--- src/main/java/info/magnolia/cms/taglibs/BaseContentTag.java	(revision 26817)
+++ src/main/java/info/magnolia/cms/taglibs/BaseContentTag.java	(working copy)
@@ -40,6 +40,7 @@
 import info.magnolia.cms.i18n.I18nContentSupport;
 import info.magnolia.cms.util.ContentUtil;
 
+import info.magnolia.context.MgnlContext;
 import javax.jcr.RepositoryException;
 import javax.servlet.jsp.tagext.TagSupport;
 
@@ -185,7 +186,14 @@
     }
 
     protected Content resolveNode(Content currentPage) {
-        Content currentParagraph = Resource.getLocalContentNode();
+        Content currentParagraph = MgnlContext.getAggregationState().getCurrentContent();
+        // TODO: Replace Resource.getCurrentActivePage() with  MgnlContext.getAggregationState().getMainContent().
+        // Unfortunately doing so will cause
+        // testContentNodeCollectionNameNPE(info.magnolia.cms.taglibs.ContentNodeIteratorTest)
+        // to fail.
+        if (currentParagraph != null && currentParagraph.getHandle().equals(Resource.getCurrentActivePage().getHandle())) {
+            currentParagraph = null;
+        }
 
         try {
             if (StringUtils.isNotEmpty(contentNodeName)) {