diff --git a/examples/notebooks/change-input-current.ipynb b/examples/notebooks/change-input-current.ipynb
index 0353eab33..22349df65 100644
--- a/examples/notebooks/change-input-current.ipynb
+++ b/examples/notebooks/change-input-current.ipynb
@@ -66,7 +66,7 @@
    "outputs": [],
    "source": [
     "# update the value of the current profile *without* changing the typical current used for non-dimensionlisation\n",
-    "param[\"Current function\"] = pybamm.GetConstantCurrent(current=8)"
+    "param[\"Current function\"] = pybamm.GetConstantCurrent(current=pybamm.Scalar(8))"
    ]
   },
   {
@@ -84,7 +84,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "0b36028f505f446fa15e3ab816c1e5ce",
+       "model_id": "fc997d14787542f69f2cba123ce0b994",
        "version_major": 2,
        "version_minor": 0
       },
@@ -175,14 +175,14 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "/home/user/Documents/PyBaMM/pybamm/parameters/standard_current_functions/get_current_data.py:85: ModelWarning: Requested time (2387.4040040888344) is outside of the data range [0, 600]\n",
+      "/home/user/Documents/PyBaMM/pybamm/parameters/standard_current_functions/get_current_data.py:88: ModelWarning: Requested time (2387.404004088835) is outside of the data range [0, 600]\n",
       "  pybamm.ModelWarning,\n"
      ]
     },
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "40f34e811e9b43209224c4b829edb5c1",
+       "model_id": "3f4c99601ab8417ba2186987cb532600",
        "version_major": 2,
        "version_minor": 0
       },
@@ -312,7 +312,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "91994467f3494f8fa63097786896af22",
+       "model_id": "913efe4e3e9e4b37bad2ded9c71b975e",
        "version_major": 2,
        "version_minor": 0
       },
diff --git a/pybamm/parameters/parameter_values.py b/pybamm/parameters/parameter_values.py
index 3c23f2c59..5866734be 100644
--- a/pybamm/parameters/parameter_values.py
+++ b/pybamm/parameters/parameter_values.py
@@ -329,15 +329,19 @@ class ParameterValues(dict):
                     # KeyError -> name not in parameter dict, don't update
                     continue
             elif isinstance(x, pybamm.Function):
-                # Need to update values in parameters_eval dict of current functions
                 if isinstance(x.function, pybamm.GetCurrent):
+                    # Need to update parameters dict to be that of the new current
+                    # function and make new parameters_eval dict to be processed
+                    x.function.parameters = self["Current function"].parameters
+                    x.function.parameters_eval = x.function.parameters.copy()
                     for param, sym in x.function.parameters.items():
-                        if isinstance(sym, pybamm.Scalar):
-                            try:
-                                x.function.parameters_eval[param] = self[sym.name]
-                            except KeyError:
-                                # KeyError -> name not in parameter dict, don't update
-                                continue
+                        # Need to process again as new symbols may be passed
+                        # e.g. may explicitly pass pybamm.Scalar(1) instead of
+                        # pybamm.electrical_parameters.I_typ
+                        if isinstance(sym, pybamm.Symbol):
+                            new_sym = self.process_symbol(sym)
+                            x.function.parameters[param] = new_sym
+                            x.function.parameters_eval[param] = new_sym.evaluate()
                     if isinstance(x.function, pybamm.GetCurrentData):
                         # update interpolant
                         x.function.interpolate()
diff --git a/pybamm/parameters/standard_current_functions/get_current_data.py b/pybamm/parameters/standard_current_functions/get_current_data.py
index 53bbc9c53..d683120ea 100644
--- a/pybamm/parameters/standard_current_functions/get_current_data.py
+++ b/pybamm/parameters/standard_current_functions/get_current_data.py
@@ -21,7 +21,7 @@ class GetCurrentData(pybamm.GetCurrent):
     units : str, optional
         The units of the current data which is to be loaded. Can be "[]" for
         dimenionless data (default), or "[A]" for current in Amperes.
-    current_cale : :class:`pybamm.Symbol` or float, optional
+    current_scale : :class:`pybamm.Symbol` or float, optional
         The scale the current in Amperes if loading non-dimensional data. Default
         is to use the typical current I_typ
 
diff --git a/results/drive_cycles/discharge_rest.py b/results/drive_cycles/discharge_rest.py
new file mode 100644
index 000000000..ad3950c64
--- /dev/null
+++ b/results/drive_cycles/discharge_rest.py
@@ -0,0 +1,85 @@
+#
+# Simulate discharge followed by rest
+#
+import pybamm
+import numpy as np
+import matplotlib.pyplot as plt
+
+# load model
+pybamm.set_logging_level("INFO")
+model = pybamm.lithium_ion.SPMe()
+
+# create geometry
+geometry = model.default_geometry
+
+# load parameter values and process model and geometry
+param = model.default_parameter_values
+# adjust current to correspond to a typical current density of 24 [A.m-2]
+C_rate = 1
+param["Typical current [A]"] = (
+    C_rate * 24 * param.process_symbol(pybamm.geometric_parameters.A_cc).evaluate()
+)
+param.process_model(model)
+param.process_geometry(geometry)
+
+# set mesh
+mesh = pybamm.Mesh(geometry, model.default_submesh_types, model.default_var_pts)
+
+# discretise model
+disc = pybamm.Discretisation(mesh, model.default_spatial_methods)
+disc.process_model(model)
+
+# solve model during discharge stage (1 hour)
+tau = param.process_symbol(pybamm.standard_parameters_lithium_ion.tau_discharge)
+t_end = 3600 / tau.evaluate(0)
+t_eval1 = np.linspace(0, t_end, 120)
+solution1 = model.default_solver.solve(model, t_eval1)
+
+# process variables for later plotting
+time1 = pybamm.ProcessedVariable(
+    model.variables["Time [h]"], solution1.t, solution1.y
+)
+voltage1 = pybamm.ProcessedVariable(
+    model.variables["Terminal voltage [V]"], solution1.t, solution1.y, mesh=mesh
+)
+current1 = pybamm.ProcessedVariable(
+    model.variables["Current [A]"], solution1.t, solution1.y, mesh=mesh
+)
+
+# solve again with zero current, using last step of solution1 as initial conditions
+# update the current to be zero
+param["Current function"] = pybamm.GetConstantCurrent(current=pybamm.Scalar(0))
+param.update_model(model, disc)
+# Note: need to update model.concatenated_initial_conditions *after* update_model,
+# as update_model updates model.concatenated_initial_conditions, by concatenting
+# the (unmodified) initial conditions for each variable
+model.concatenated_initial_conditions = solution1.y[:, -1][:, np.newaxis]
+
+# simulate 1 hour of rest
+t_start = solution1.t[-1]
+t_end = t_start + 3600 / tau.evaluate(0)
+t_eval2 = np.linspace(t_start, t_end, 120)
+solution2 = model.default_solver.solve(model, t_eval2)
+
+# process variables for later plotting
+time2 = pybamm.ProcessedVariable(
+    model.variables["Time [h]"], solution2.t, solution2.y
+)
+voltage2 = pybamm.ProcessedVariable(
+    model.variables["Terminal voltage [V]"], solution2.t, solution2.y, mesh=mesh
+)
+current2 = pybamm.ProcessedVariable(
+    model.variables["Current [A]"], solution2.t, solution2.y, mesh=mesh
+)
+
+# plot
+plt.subplot(121)
+plt.plot(time1(t_eval1), voltage1(t_eval1), time2(t_eval2), voltage2(t_eval2))
+plt.xlabel('Time [h]')
+plt.ylabel('Voltage [V]')
+plt.subplot(122)
+z = np.linspace(0, 1, 10)
+plt.plot(time1(t_eval1), current1(t_eval1), time2(t_eval2), current2(t_eval2))
+plt.xlabel('Time [h]')
+plt.ylabel('Current [A]')
+plt.show()

update_model doesn't catch param in current function
When updating the parameters using `update_model`, the parameters used in the current functions aren't updated properly 

diff --git a/tests/unit/test_parameters/test_update_parameters.py b/tests/unit/test_parameters/test_update_parameters.py
index 2b4a8b60e..7707a9517 100644
--- a/tests/unit/test_parameters/test_update_parameters.py
+++ b/tests/unit/test_parameters/test_update_parameters.py
@@ -60,6 +60,33 @@ class TestUpdateParameters(unittest.TestCase):
         # results should be different
         self.assertNotEqual(np.linalg.norm(Y1 - Y2), 0)
 
+        # test with new current function
+        model3 = pybamm.ReactionDiffusionModel()
+        modeltest3 = tests.StandardModelTest(model3)
+        modeltest3.test_all()
+        parameter_values_update = pybamm.ParameterValues(
+            base_parameters=model3.default_parameter_values,
+            optional_parameters={
+                "Current function": pybamm.GetConstantCurrent(current=pybamm.Scalar(0))
+            },
+        )
+        modeltest3.test_update_parameters(parameter_values_update)
+        modeltest3.test_solving(t_eval=t_eval)
+        Y3 = modeltest3.solution.y
+
+        # function.parameters should be pybamm.Scalar(0), but parameters_eval s
+        # should be a float
+        self.assertIsInstance(
+            model3.variables["Current [A]"].function.parameters["Current [A]"],
+            pybamm.Scalar,
+        )
+        self.assertEqual(
+            model3.variables["Current [A]"].function.parameters_eval["Current [A]"], 0.0
+        )
+
+        # results should be different
+        self.assertNotEqual(np.linalg.norm(Y1 - Y3), 0)
+
     def test_update_geometry(self):
         # standard model
         model1 = pybamm.ReactionDiffusionModel()

pip install -e .[dev,docs]
parse_log_pytest
requirements.txt
pytest coverage
apt-get update apt-get install -y gcc
3.9
requirements/base.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
alabaster==0.7.16
anyio==4.9.0
anytree==2.12.1
argon2-cffi==23.1.0
argon2-cffi-bindings==21.2.0
arrow==1.3.0
asttokens==3.0.0
async-lru==2.0.5
attrs==25.3.0
autograd==1.7.0
babel==2.17.0
beautifulsoup4==4.13.3
bleach==6.2.0
certifi==2025.1.31
cffi==1.17.1
charset-normalizer==3.4.1
comm==0.2.2
contourpy==1.3.0
coverage==7.8.0
cycler==0.12.1
debugpy==1.8.13
decorator==5.2.1
defusedxml==0.7.1
docutils==0.21.2
exceptiongroup==1.2.2
executing==2.2.0
fastjsonschema==2.21.1
flake8==7.2.0
fonttools==4.56.0
fqdn==1.5.1
guzzle_sphinx_theme==0.7.11
h11==0.14.0
httpcore==1.0.7
httpx==0.28.1
idna==3.10
imagesize==1.4.1
importlib_metadata==8.6.1
importlib_resources==6.5.2
iniconfig==2.1.0
ipykernel==6.29.5
ipython==8.18.1
ipywidgets==8.1.5
isoduration==20.11.0
jedi==0.19.2
Jinja2==3.1.6
json5==0.10.0
jsonpointer==3.0.0
jsonschema==4.23.0
jsonschema-specifications==2024.10.1
jupyter==1.1.1
jupyter-console==6.6.3
jupyter-events==0.12.0
jupyter-lsp==2.2.5
jupyter_client==8.6.3
jupyter_core==5.7.2
jupyter_server==2.15.0
jupyter_server_terminals==0.5.3
jupyterlab==4.3.6
jupyterlab_pygments==0.3.0
jupyterlab_server==2.27.3
jupyterlab_widgets==3.0.13
kiwisolver==1.4.7
MarkupSafe==3.0.2
matplotlib==3.9.4
matplotlib-inline==0.1.7
mccabe==0.7.0
mistune==3.1.3
nbclient==0.10.2
nbconvert==7.16.6
nbformat==5.10.4
nest-asyncio==1.6.0
notebook==7.3.3
notebook_shim==0.2.4
numpy==2.0.2
overrides==7.7.0
packaging==24.2
pandas==2.2.3
pandocfilters==1.5.1
parso==0.8.4
pexpect==4.9.0
pillow==11.1.0
platformdirs==4.3.7
pluggy==1.5.0
prometheus_client==0.21.1
prompt_toolkit==3.0.50
psutil==7.0.0
ptyprocess==0.7.0
pure_eval==0.2.3
-e git+https://github.com/pybamm-team/PyBaMM.git@4202941d09ee285ad4806b81690ee72733a1653d#egg=pybamm
pycodestyle==2.13.0
pycparser==2.22
pyflakes==3.3.1
Pygments==2.19.1
pyparsing==3.2.3
pytest==8.3.5
python-dateutil==2.9.0.post0
python-json-logger==3.3.0
pytz==2025.2
PyYAML==6.0.2
pyzmq==26.3.0
referencing==0.36.2
requests==2.32.3
rfc3339-validator==0.1.4
rfc3986-validator==0.1.1
rpds-py==0.24.0
scipy==1.13.1
Send2Trash==1.8.3
six==1.17.0
sniffio==1.3.1
snowballstemmer==2.2.0
soupsieve==2.6
Sphinx==7.4.7
sphinxcontrib-applehelp==2.0.0
sphinxcontrib-devhelp==2.0.0
sphinxcontrib-htmlhelp==2.1.0
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==2.0.0
sphinxcontrib-serializinghtml==2.0.0
stack-data==0.6.3
terminado==0.18.1
tinycss2==1.4.0
tomli==2.2.1
tornado==6.4.2
traitlets==5.14.3
types-python-dateutil==2.9.0.20241206
typing_extensions==4.13.0
tzdata==2025.2
uri-template==1.3.0
urllib3==2.3.0
wcwidth==0.2.13
webcolors==24.11.1
webencodings==0.5.1
websocket-client==1.8.0
widgetsnbextension==4.0.13
zipp==3.21.0

name: PyBaMM
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=3.0.16=h5eee18b_0
  - pip=25.0=py39h06a4308_0
  - python=3.9.21=he870216_1
  - readline=8.2=h5eee18b_0
  - setuptools=75.8.0=py39h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.45.1=py39h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - alabaster==0.7.16
      - anyio==4.9.0
      - anytree==2.12.1
      - argon2-cffi==23.1.0
      - argon2-cffi-bindings==21.2.0
      - arrow==1.3.0
      - asttokens==3.0.0
      - async-lru==2.0.5
      - attrs==25.3.0
      - autograd==1.7.0
      - babel==2.17.0
      - beautifulsoup4==4.13.3
      - bleach==6.2.0
      - certifi==2025.1.31
      - cffi==1.17.1
      - charset-normalizer==3.4.1
      - comm==0.2.2
      - contourpy==1.3.0
      - coverage==7.8.0
      - cycler==0.12.1
      - debugpy==1.8.13
      - decorator==5.2.1
      - defusedxml==0.7.1
      - docutils==0.21.2
      - exceptiongroup==1.2.2
      - executing==2.2.0
      - fastjsonschema==2.21.1
      - flake8==7.2.0
      - fonttools==4.56.0
      - fqdn==1.5.1
      - guzzle-sphinx-theme==0.7.11
      - h11==0.14.0
      - httpcore==1.0.7
      - httpx==0.28.1
      - idna==3.10
      - imagesize==1.4.1
      - importlib-metadata==8.6.1
      - importlib-resources==6.5.2
      - iniconfig==2.1.0
      - ipykernel==6.29.5
      - ipython==8.18.1
      - ipywidgets==8.1.5
      - isoduration==20.11.0
      - jedi==0.19.2
      - jinja2==3.1.6
      - json5==0.10.0
      - jsonpointer==3.0.0
      - jsonschema==4.23.0
      - jsonschema-specifications==2024.10.1
      - jupyter==1.1.1
      - jupyter-client==8.6.3
      - jupyter-console==6.6.3
      - jupyter-core==5.7.2
      - jupyter-events==0.12.0
      - jupyter-lsp==2.2.5
      - jupyter-server==2.15.0
      - jupyter-server-terminals==0.5.3
      - jupyterlab==4.3.6
      - jupyterlab-pygments==0.3.0
      - jupyterlab-server==2.27.3
      - jupyterlab-widgets==3.0.13
      - kiwisolver==1.4.7
      - markupsafe==3.0.2
      - matplotlib==3.9.4
      - matplotlib-inline==0.1.7
      - mccabe==0.7.0
      - mistune==3.1.3
      - nbclient==0.10.2
      - nbconvert==7.16.6
      - nbformat==5.10.4
      - nest-asyncio==1.6.0
      - notebook==7.3.3
      - notebook-shim==0.2.4
      - numpy==2.0.2
      - overrides==7.7.0
      - packaging==24.2
      - pandas==2.2.3
      - pandocfilters==1.5.1
      - parso==0.8.4
      - pexpect==4.9.0
      - pillow==11.1.0
      - platformdirs==4.3.7
      - pluggy==1.5.0
      - prometheus-client==0.21.1
      - prompt-toolkit==3.0.50
      - psutil==7.0.0
      - ptyprocess==0.7.0
      - pure-eval==0.2.3
      - pycodestyle==2.13.0
      - pycparser==2.22
      - pyflakes==3.3.1
      - pygments==2.19.1
      - pyparsing==3.2.3
      - pytest==8.3.5
      - python-dateutil==2.9.0.post0
      - python-json-logger==3.3.0
      - pytz==2025.2
      - pyyaml==6.0.2
      - pyzmq==26.3.0
      - referencing==0.36.2
      - requests==2.32.3
      - rfc3339-validator==0.1.4
      - rfc3986-validator==0.1.1
      - rpds-py==0.24.0
      - scipy==1.13.1
      - send2trash==1.8.3
      - six==1.17.0
      - sniffio==1.3.1
      - snowballstemmer==2.2.0
      - soupsieve==2.6
      - sphinx==7.4.7
      - sphinxcontrib-applehelp==2.0.0
      - sphinxcontrib-devhelp==2.0.0
      - sphinxcontrib-htmlhelp==2.1.0
      - sphinxcontrib-jsmath==1.0.1
      - sphinxcontrib-qthelp==2.0.0
      - sphinxcontrib-serializinghtml==2.0.0
      - stack-data==0.6.3
      - terminado==0.18.1
      - tinycss2==1.4.0
      - tomli==2.2.1
      - tornado==6.4.2
      - traitlets==5.14.3
      - types-python-dateutil==2.9.0.20241206
      - typing-extensions==4.13.0
      - tzdata==2025.2
      - uri-template==1.3.0
      - urllib3==2.3.0
      - wcwidth==0.2.13
      - webcolors==24.11.1
      - webencodings==0.5.1
      - websocket-client==1.8.0
      - widgetsnbextension==4.0.13
      - zipp==3.21.0
prefix: /opt/conda/envs/PyBaMM

tests/unit/test_parameters/test_update_parameters.py::TestUpdateParameters::test_update_model
tests/unit/test_parameters/test_update_parameters.py::TestUpdateParameters::test_set_and_update_parameters tests/unit/test_parameters/test_update_parameters.py::TestUpdateParameters::test_update_geometry tests/unit/test_parameters/test_update_parameters.py::TestUpdateParameters::test_update_parameters_eqn
results/drive_cycles/discharge_rest.py examples/notebooks/change-input-current.ipynb pybamm/parameters/parameter_values.py pybamm/parameters/standard_current_functions/get_current_data.py
results/drive_cycles/discharge_rest.py examples/notebooks/change-input-current.ipynb pybamm/parameters/parameter_values.py pybamm/parameters/standard_current_functions/get_current_data.py