2 files changed, 18 insertions, 12 deletions
diff --git a/src/definitions/location.ts b/src/definitions/location.ts
index 9af95fc2..b8e7ebab 100644
--- a/src/definitions/location.ts
+++ b/src/definitions/location.ts
@@ -72,7 +72,7 @@ export type LocationDefinition = LocaleEntry<{
   direction_abbr: string[];
 
   /**
-   * The pattern used to generate building numbers.
+   * The pattern used to generate building numbers. Since building numbers rarely start with 0, any consecutive # characters will be replaced by a number without a leading zero.
    */
   building_number: string[];
 
@@ -112,7 +112,7 @@ export type LocationDefinition = LocaleEntry<{
   };
 
   /**
-   * The address "inside" an address/e.g. an apartment or office.
+   * The address "inside" an address/e.g. an apartment or office. Since these rarely start with 0, any consecutive # characters will be replaced by a number without a leading zero.
    */
   secondary_address: string[];
 
diff --git a/src/modules/location/index.ts b/src/modules/location/index.ts
index e924bd7e..5b5d37a1 100644
--- a/src/modules/location/index.ts
+++ b/src/modules/location/index.ts
@@ -188,11 +188,14 @@ export class LocationModule {
    * @since 8.0.0
    */
   buildingNumber(): string {
-    const format = this.faker.helpers.arrayElement(
-      this.faker.definitions.location.building_number
-    );
-
-    return this.faker.helpers.replaceSymbolWithNumber(format);
+    return this.faker.helpers
+      .arrayElement(this.faker.definitions.location.building_number)
+      .replace(/#+/g, (m) =>
+        this.faker.string.numeric({
+          length: m.length,
+          allowLeadingZeros: false,
+        })
+      );
   }
 
   /**
@@ -281,11 +284,14 @@ export class LocationModule {
    * @since 8.0.0
    */
   secondaryAddress(): string {
-    return this.faker.helpers.replaceSymbolWithNumber(
-      this.faker.helpers.arrayElement(
-        this.faker.definitions.location.secondary_address
-      )
-    );
+    return this.faker.helpers
+      .arrayElement(this.faker.definitions.location.secondary_address)
+      .replace(/#+/g, (m) =>
+        this.faker.string.numeric({
+          length: m.length,
+          allowLeadingZeros: false,
+        })
+      );
   }
 
   /**