diff --git a/src/Illuminate/Filesystem/FilesystemAdapter.php b/src/Illuminate/Filesystem/FilesystemAdapter.php
index 46e23072c58d..00760bafb611 100644
--- a/src/Illuminate/Filesystem/FilesystemAdapter.php
+++ b/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -847,6 +847,10 @@ public function temporaryUploadUrl($path, $expiration, array $options = [])
      */
     protected function concatPathToUrl($url, $path)
     {
+        if (empty($url) || empty($path)) {
+            return $url ?: $path;
+        }
+
         return rtrim($url, '/').'/'.ltrim($path, '/');
     }