diff --git a/server/configurations/local.yaml b/server/configurations/local.yaml
index 0e456a53afee1723df7af57d0f3c900245b78929..7785f56019878364ff784b325201526727120c56 100644
--- a/server/configurations/local.yaml
+++ b/server/configurations/local.yaml
@@ -73,8 +73,11 @@ http:
 
 # Specify the base endpoints for various apps
 apps:
-    public-albums: "https://albums.ente.io"
-
+    # Default is https://albums.ente.io
+    #
+    # If you're running a self hosted instance and wish to serve public links,
+    # set this to the URL where your albums web app is running.
+    public-albums:
 
 # Database connection parameters
 db:
diff --git a/server/pkg/repo/public_collection.go b/server/pkg/repo/public_collection.go
index d4aa81bf296b64da98676afa84b3f6510d594581..6c6106a77a298e965a46b1c88aa172bc6ea77626 100644
--- a/server/pkg/repo/public_collection.go
+++ b/server/pkg/repo/public_collection.go
@@ -23,7 +23,7 @@ type PublicCollectionRepository struct {
 // NewPublicCollectionRepository ..
 func NewPublicCollectionRepository(db *sql.DB, albumHost string) *PublicCollectionRepository {
 	if albumHost == "" {
-		panic("albumHost can not be empty")
+		albumHost = "https://albums.ente.io"
 	}
 	return &PublicCollectionRepository{
 		DB:        db,