diff --git a/client/src/Components/Counter.js b/client/src/Components/Counter.js
index 56a08719..84cb7cad 100644
--- a/client/src/Components/Counter.js
+++ b/client/src/Components/Counter.js
@@ -40,6 +40,7 @@ function Counter({ label, min, max, name, onChange, value, isEditing }) {
             id={name}
             name={name}
             value={value}
+            onChange={onChange}
           />
         )}
         <button type="button" className="usa-button counter__button counter__button--increment" onClick={handleIncrement}>
diff --git a/client/src/ER/Beds.js b/client/src/ER/Beds.js
index 73ba1bb3..c50ca2d6 100644
--- a/client/src/ER/Beds.js
+++ b/client/src/ER/Beds.js
@@ -17,7 +17,7 @@ function Beds({ statusUpdate, onStatusUpdate, incomingRingdownsCount }) {
 
   function handleChange(event) {
     const newStatusUpdate = new HospitalStatus(statusUpdate);
-    newStatusUpdate[event.target.name] = parseInt(event.target.value, 10);
+    newStatusUpdate[event.target.name] = parseInt(event.target.value, 10) || 0;
     onStatusUpdate(newStatusUpdate);
   }
 
diff --git a/e2e/tests/erStatus.spec.js b/e2e/tests/erStatus.spec.js
index 19ca4144..38dca869 100644
--- a/e2e/tests/erStatus.spec.js
+++ b/e2e/tests/erStatus.spec.js
@@ -10,6 +10,7 @@ test.describe('ER status', () => {
     await password.fill('abcd1234');
     await password.press('Enter');
     await expect(appPage).toHaveURL('/er');
+    await appPage.reload();
     await appPage.getByRole('button', { name: /hospital/i }).click();
     await expect(appPage.getByText(/available beds/i)).toBeVisible();
     await expect(appPage.getByText(/er conditions/i)).toBeVisible();
@@ -23,20 +24,16 @@ test.describe('ER status', () => {
   test('EMS checks hospital status', async ({ context }) => {
     const appPage = await context.newPage();
     await appPage.goto('/');
-    await appPage.getByLabel('Email').fill('op.ems@c4sf.me');
+    await appPage.getByLabel('Email').fill('op.ems.1@c4sf.me');
     const password = appPage.getByLabel('Password');
     await password.fill('abcd1234');
     await password.press('Enter');
     await expect(appPage).toHaveURL('/ems');
     await appPage.getByRole('button', { name: /hospital info/i }).click();
-    // await expect(appPage.locator('.hospitalstatusrow_container')
-    //                   .filter({ hasText: /ucsf parnassus/i })
-    //                   .filter({ has: appPage.locator('.hospitalstatusrow__notes').filter({ hasText: 'scanner fixed' })})).toBeVisible();
-    const row = appPage.locator('.hospitalstatusrow_container').filter({ hasText: /ucsf parnassus/i });
-
-    // await expect(row.locator('.hospitalstatusrow__data', { hasText: '5' })).toBeVisible();
-    // await expect(row.locator('.hospitalstatusrow__data', { hasText: '8' })).toBeVisible();
-    await expect(row.locator('.hospitalstatusrow__notes').filter({ hasText: 'scanner broke' })).toBeVisible();
+    const ucsfRow = appPage.locator('.hospitalstatusrow_container').filter({ hasText: /ucsf parnassus/i });
+    await expect(ucsfRow.getByText('5')).toBeVisible();
+    await expect(ucsfRow.getByText('8')).toBeVisible();
+    await expect(ucsfRow.getByText('scanner broke')).toBeVisible();
     await context.close();
   });
 
@@ -48,6 +45,7 @@ test.describe('ER status', () => {
     await password.fill('abcd1234');
     await password.press('Enter');
     await expect(appPage).toHaveURL('/er');
+    await appPage.reload();
     await appPage.getByRole('button', { name: /hospital/i }).click();
     await expect(appPage.getByText(/available beds/i)).toBeVisible();
     await expect(appPage.getByText(/er conditions/i)).toBeVisible();
@@ -61,7 +59,7 @@ test.describe('ER status', () => {
   test('EMS checks hospital status after reset', async ({ context }) => {
     const appPage = await context.newPage();
     await appPage.goto('/');
-    await appPage.getByLabel('Email').fill('op.ems@c4sf.me');
+    await appPage.getByLabel('Email').fill('op.ems.1@c4sf.me');
     const password = appPage.getByLabel('Password');
     await password.fill('abcd1234');
     await password.press('Enter');