diff --git a/src/opm/output/eclipse/Summary.cpp b/src/opm/output/eclipse/Summary.cpp
index 12f5d81c4..5ba1d9386 100644
--- a/src/opm/output/eclipse/Summary.cpp
+++ b/src/opm/output/eclipse/Summary.cpp
@@ -2734,6 +2734,7 @@ void Summary::eval(SummaryState&                  st,
     validateElapsedTime(secs_elapsed, es, st);
 
     const double duration = secs_elapsed - st.get_elapsed();
+    single_values["TIMESTEP"] = duration;
 
     /* Report_step is the one-based sequence number of the containing report.
      * Report_step = 0 for the initial condition, before simulation starts.
diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp
index af11b0d9d..4ea8fac60 100644
--- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp
+++ b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp
@@ -60,7 +60,6 @@ bool is_udq(const std::string& key) {
         this->add("NEWTON", 0.0);
         this->add("TCPU", 0.0);
         this->add("TIME", 0.0);
-        this->add("TIMESTEP", 0.0);
     }
 
     void UDQContext::update(const std::string& keyword, const UDQSet& udq_result) {
diff --git a/tests/parser/UDQTests.cpp b/tests/parser/UDQTests.cpp
index bf38df12f..26afdbe72 100644
--- a/tests/parser/UDQTests.cpp
+++ b/tests/parser/UDQTests.cpp
@@ -566,7 +566,7 @@ BOOST_AUTO_TEST_CASE(UDQ_CONTEXT) {
     BOOST_CHECK_EQUAL(*ctx.get("JAN"), 1.0);
     BOOST_CHECK_THROW(ctx.get("NO_SUCH_KEY"), std::out_of_range);
 
-    for (std::string& key : std::vector<std::string>({"ELAPSED", "MSUMLINS", "MSUMNEWT", "NEWTON", "TCPU", "TIME", "TIMESTEP"}))
+    for (std::string& key : std::vector<std::string>({"ELAPSED", "MSUMLINS", "MSUMNEWT", "NEWTON", "TCPU", "TIME"}))
         BOOST_CHECK_NO_THROW( ctx.get(key) );
 
     st.update("SX:KEY", 1.0);
@@ -1927,6 +1927,7 @@ DEFINE WUGASRA  750000 - WGLIR '*' /
     UDQState udq_state(undefined_value);
     SummaryState st(std::chrono::system_clock::now());
 
+    st.update("TIMESTEP", 100);
     st.update("FMWPR", 100);
     st.update("FMWIN", 100);
     st.update("FMWPA", 100);
@@ -2124,6 +2125,7 @@ DEFINE FU_VAR91 GOPR TEST  /
     st.update("FMWPA", 100);
     st.update("FMWIA", 100);
     st.update("FOPR", 100);
+    st.update("TIMESTEP", 100);
     st.update_well_var("W1", "WGLIR", 1);
     st.update_well_var("W2", "WGLIR", 2);
     st.update_well_var("W3", "WGLIR", 3);