diff --git a/charts/vs-registrar/files/init-db.sh b/charts/vs-registrar/files/init-db.sh
index dd880fbdedcc80104836ae427ab3bd852df4affc..035539ed688f0bf3eb9c9af0bc1ccc841ef37b62 100644
--- a/charts/vs-registrar/files/init-db.sh
+++ b/charts/vs-registrar/files/init-db.sh
@@ -106,12 +106,14 @@ if python3 manage.py id check {{ index (keys $.Values.global.collections | sortA
         {{ range $coverage_type_name, $coverage_type := $product_type.coverages }}--coverage-type {{ $coverage_type_name | quote }} \
         {{ end }}--traceback
 
-    {{- if hasKey $product_type "defaultBrowse" }}
-    {{ template "browsetype.cli" dict "product_type_name" $product_type.name "browse_type_name" nil "browse_type" (get $product_type.browses $product_type.defaultBrowse) }}
-    {{- end }}
-
     {{- range $browse_type_name, $browse_type := $product_type.browses }}
     {{ template "browsetype.cli" dict "product_type_name" $product_type.name "browse_type_name" $browse_type_name "browse_type" $browse_type }}
+    {{- if hasKey $product_type "defaultBrowse" }}
+    {{ $defaultBrowse := get $product_type "defaultBrowse"}}
+    {{- if eq $browse_type_name $defaultBrowse}}
+    {{ template "browsetype.cli" dict "product_type_name" $product_type.name "browse_type_name" "" "browse_type" $browse_type }}
+    {{- end }}
+    {{- end }}
     {{- end }}
 
     {{- range $mask_type := $product_type.masks }}
diff --git a/charts/vs-renderer/files/init-db.sh b/charts/vs-renderer/files/init-db.sh
index dd880fbdedcc80104836ae427ab3bd852df4affc..035539ed688f0bf3eb9c9af0bc1ccc841ef37b62 100644
--- a/charts/vs-renderer/files/init-db.sh
+++ b/charts/vs-renderer/files/init-db.sh
@@ -106,12 +106,14 @@ if python3 manage.py id check {{ index (keys $.Values.global.collections | sortA
         {{ range $coverage_type_name, $coverage_type := $product_type.coverages }}--coverage-type {{ $coverage_type_name | quote }} \
         {{ end }}--traceback
 
-    {{- if hasKey $product_type "defaultBrowse" }}
-    {{ template "browsetype.cli" dict "product_type_name" $product_type.name "browse_type_name" nil "browse_type" (get $product_type.browses $product_type.defaultBrowse) }}
-    {{- end }}
-
     {{- range $browse_type_name, $browse_type := $product_type.browses }}
     {{ template "browsetype.cli" dict "product_type_name" $product_type.name "browse_type_name" $browse_type_name "browse_type" $browse_type }}
+    {{- if hasKey $product_type "defaultBrowse" }}
+    {{ $defaultBrowse := get $product_type "defaultBrowse"}}
+    {{- if eq $browse_type_name $defaultBrowse}}
+    {{ template "browsetype.cli" dict "product_type_name" $product_type.name "browse_type_name" "" "browse_type" $browse_type }}
+    {{- end }}
+    {{- end }}
     {{- end }}
 
     {{- range $mask_type := $product_type.masks }}