diff --git a/Classes/Aspects/AugmentationAspect.php b/Classes/Aspects/AugmentationAspect.php
index 1138d150de..c29f45d82d 100644
--- a/Classes/Aspects/AugmentationAspect.php
+++ b/Classes/Aspects/AugmentationAspect.php
@@ -145,6 +145,10 @@ public function editableElementAugmentation(JoinPointInterface $joinPoint)
             return $content;
         }
 
+        if ($this->nodeAuthorizationService->isGrantedToEditNode($node) === false) {
+            return $content;
+        }
+
         $content = $joinPoint->getAdviceChain()->proceed($joinPoint);
 
         $attributes = [
@@ -166,6 +170,6 @@ protected function needsMetadata(NodeInterface $node, $renderCurrentDocumentMeta
         /** @var $contentContext ContentContext */
         $contentContext = $node->getContext();
 
-        return ($contentContext->isInBackend() === true && ($renderCurrentDocumentMetadata === true || $this->nodeAuthorizationService->isGrantedToEditNode($node) === true));
+        return $contentContext->isInBackend() === true || $renderCurrentDocumentMetadata === true;
     }
 }