diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
index ea95c9842e..32e88224cc 100644
--- a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
+++ b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
@@ -52,19 +52,16 @@ public function preSave() {
    */
   public function postSave($update) {
     // Only process a non-empty alias.
-    $source = NULL;
-    if ($this->alias) {
-      $entity = $this->getEntity();
-      if ($entity->getEntityType()->isRevisionable() && !$entity->isDefaultRevision()) {
-        $source = $entity->toUrl('revision')->getInternalPath();
-      }
-      else {
-        $source = $entity->toUrl()->getInternalPath();
-      }
+    $entity = $this->getEntity();
+    if ($entity->getEntityType()->isRevisionable() && !$entity->isDefaultRevision()) {
+      $source = '/' . $entity->toUrl('revision')->getInternalPath();
+    }
+    else {
+      $source = '/' . $entity->toUrl()->getInternalPath();
     }
 
-    if ($source && (!$update || $source != $this->source)) {
-      if ($path = \Drupal::service('path.alias_storage')->save('/' . $source, $this->alias, $this->getLangcode())) {
+    if ($this->alias && (!$update || $source != $this->source)) {
+      if ($path = \Drupal::service('path.alias_storage')->save($source, $this->alias, $this->getLangcode())) {
           $this->pid = $path['pid'];
       }
     }
@@ -75,7 +72,7 @@ public function postSave($update) {
       }
       // Only save a non-empty alias.
       elseif ($source) {
-        \Drupal::service('path.alias_storage')->save('/' . $source, $this->alias, $this->getLangcode(), $this->pid);
+        \Drupal::service('path.alias_storage')->save($source, $this->alias, $this->getLangcode(), $this->pid);
       }
     }
   }