diff --git a/src/JsonSchema/SchemaStorage.php b/src/JsonSchema/SchemaStorage.php
index 58650cd9..6e75ec17 100644
--- a/src/JsonSchema/SchemaStorage.php
+++ b/src/JsonSchema/SchemaStorage.php
@@ -92,7 +92,7 @@ private function expandRefs(&$schema, $base = null)
             return;
         }
 
-        if (property_exists($schema, 'id') && is_string($schema->id)) {
+        if (property_exists($schema, 'id') && is_string($schema->id) && $base != $schema->id) {
             $base = $this->uriResolver->resolve($schema->id, $base);
         }
 
diff --git a/tests/SchemaStorageTest.php b/tests/SchemaStorageTest.php
index 9fd27bae..0aa219ac 100644
--- a/tests/SchemaStorageTest.php
+++ b/tests/SchemaStorageTest.php
@@ -302,4 +302,25 @@ public function testMetaSchemaFixes()
         $this->assertEquals('uri-reference', $draft_03->properties->{'$ref'}->format);
         $this->assertEquals('uri-reference', $draft_04->properties->id->format);
     }
+
+    public function testNoDoubleResolve()
+    {
+        $schemaOne = json_decode('{"id": "test/schema", "$ref": "../test2/schema2"}');
+
+        $uriRetriever = $this->prophesize('JsonSchema\UriRetrieverInterface');
+        $uriRetriever->retrieve('test/schema')->willReturn($schemaOne)->shouldBeCalled();
+
+        $s = new SchemaStorage($uriRetriever->reveal());
+        $schema = $s->addSchema('test/schema');
+
+        $r = new \ReflectionObject($s);
+        $p = $r->getProperty('schemas');
+        $p->setAccessible(true);
+        $schemas = $p->getValue($s);
+
+        $this->assertEquals(
+            'file://' . getcwd() . '/test2/schema2#',
+            $schemas['test/schema']->{'$ref'}
+        );
+    }
 }