diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65a646fa9..c3317ff64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#bugfix)
     * Fixed `Security::sanitizeSVG()` creating an empty file if SVG file cannot be parsed
+    * Fixed infinite loop in blueprints with `extend@` to a parent stream
 
 # v1.7.0-rc.16
 ## 09/01/2020
diff --git a/system/src/Grav/Common/Data/Blueprint.php b/system/src/Grav/Common/Data/Blueprint.php
index 333db7289..3504de276 100644
--- a/system/src/Grav/Common/Data/Blueprint.php
+++ b/system/src/Grav/Common/Data/Blueprint.php
@@ -349,7 +349,11 @@ class Blueprint extends BlueprintForm
 
         if (\is_string($path) && !$locator->isStream($path)) {
             // Find path overrides.
-            $paths = (array) ($this->overrides[$path] ?? null);
+            if (null === $context) {
+                $paths = (array) ($this->overrides[$path] ?? null);
+            } else {
+                $paths = [];
+            }
 
             // Add path pointing to default context.
             if ($context === null) {