diff --git a/src/charm.py b/src/charm.py
index f4d01786..1bf3f2fb 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -144,7 +144,6 @@ def _on_jenkins_pebble_ready(self, event: ops.PebbleReadyEvent) -> None:
             return
 
         self.unit.set_workload_version(version)
-        self.unit.set_ports(jenkins.WEB_PORT)
         self.unit.status = ops.ActiveStatus()
 
     def _remove_unlisted_plugins(self, container: ops.Container) -> ops.StatusBase:
@@ -195,6 +194,8 @@ def _on_jenkins_home_storage_attached(self, event: ops.StorageAttachedEvent) ->
         container = self.unit.get_container(JENKINS_SERVICE_NAME)
         if not container.can_connect():
             self.unit.status = ops.WaitingStatus("Waiting for pebble.")
+            # This event should be handled again once the container becomes available.
+            event.defer()
             return
 
         command = [
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index dcbd3df1..0331fa33 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -194,7 +194,6 @@ def test__on_jenkins_pebble_ready(
     assert (
         jenkins_charm.unit.status.name == ACTIVE_STATUS_NAME
     ), f"unit should be in {ACTIVE_STATUS_NAME}"
-    assert jenkins.WEB_PORT in {open_port.port for open_port in harness.model.unit.opened_ports()}
 
 
 @pytest.mark.parametrize(