diff --git a/frontend/src/common/schemas/apartment.ts b/frontend/src/common/schemas/apartment.ts
index 6323e90a3..599b687de 100644
--- a/frontend/src/common/schemas/apartment.ts
+++ b/frontend/src/common/schemas/apartment.ts
@@ -259,7 +259,7 @@ export type SurfaceAreaPriceCeilingCalculation = z.infer<typeof SurfaceAreaPrice
 
 export const ApartmentAddressSchema = AddressSchema.extend({
     apartment_number: writableRequiredNumber,
-    floor: nullishNumber,
+    floor: string().nullable(),
     stair: string().min(1, "Pakollinen kenttä!"),
 });
 export type IApartmentAddress = z.infer<typeof ApartmentAddressSchema>;
diff --git a/frontend/src/features/apartment/ApartmentCreatePage.tsx b/frontend/src/features/apartment/ApartmentCreatePage.tsx
index dc37ad3ef..8e2d041e6 100644
--- a/frontend/src/features/apartment/ApartmentCreatePage.tsx
+++ b/frontend/src/features/apartment/ApartmentCreatePage.tsx
@@ -328,7 +328,7 @@ const LoadedApartmentCreatePage = () => {
                             />
                         </div>
                         <div className="row">
-                            <NumberInput
+                            <TextInput
                                 name="address.floor"
                                 label="Kerros"
                             />