diff --git a/pkg/storage/local/local.go b/pkg/storage/local/local.go
index 4e1ede65..c395cf30 100644
--- a/pkg/storage/local/local.go
+++ b/pkg/storage/local/local.go
@@ -330,7 +330,7 @@ func (s *Store) DeleteNarInfo(ctx context.Context, hash string) error {
 
 // HasNar returns true if the store has the nar.
 func (s *Store) HasNar(ctx context.Context, narURL nar.URL) bool {
-	tfp, err := narURL.ToFilePath()
+	tfp, err := narURL.Normalize().ToFilePath()
 	if err != nil {
 		return false
 	}
@@ -356,7 +356,10 @@ func (s *Store) HasNar(ctx context.Context, narURL nar.URL) bool {
 // GetNar returns nar from the store.
 // NOTE: The caller must close the returned io.ReadCloser!
 func (s *Store) GetNar(ctx context.Context, narURL nar.URL) (int64, io.ReadCloser, error) {
-	tfp, err := narURL.ToFilePath()
+	// Normalize the NAR URL to handle URLs with embedded narinfo hash prefix
+	normalizedURL := narURL.Normalize()
+
+	tfp, err := normalizedURL.ToFilePath()
 	if err != nil {
 		return 0, nil, err
 	}
@@ -393,7 +396,10 @@ func (s *Store) GetNar(ctx context.Context, narURL nar.URL) (int64, io.ReadClose
 
 // PutNar puts the nar in the store.
 func (s *Store) PutNar(ctx context.Context, narURL nar.URL, body io.Reader) (int64, error) {
-	tfp, err := narURL.ToFilePath()
+	// Normalize the NAR URL to handle URLs with embedded narinfo hash prefix
+	normalizedURL := narURL.Normalize()
+
+	tfp, err := normalizedURL.ToFilePath()
 	if err != nil {
 		return 0, err
 	}
@@ -450,7 +456,10 @@ func (s *Store) PutNar(ctx context.Context, narURL nar.URL, body io.Reader) (int
 
 // DeleteNar deletes the nar from the store.
 func (s *Store) DeleteNar(ctx context.Context, narURL nar.URL) error {
-	tfp, err := narURL.ToFilePath()
+	// Normalize the NAR URL to handle URLs with embedded narinfo hash prefix
+	normalizedURL := narURL.Normalize()
+
+	tfp, err := normalizedURL.ToFilePath()
 	if err != nil {
 		return err
 	}
diff --git a/pkg/storage/s3/s3.go b/pkg/storage/s3/s3.go
index 86391e25..2be6e885 100644
--- a/pkg/storage/s3/s3.go
+++ b/pkg/storage/s3/s3.go
@@ -566,7 +566,7 @@ func (s *Store) narInfoPath(hash string) (string, error) {
 }
 
 func (s *Store) narPath(narURL nar.URL) (string, error) {
-	tfp, err := narURL.ToFilePath()
+	tfp, err := narURL.Normalize().ToFilePath()
 	if err != nil {
 		return "", err
 	}