diff --git a/examples/rvc-app/RVC_app_state_diagram.png b/examples/rvc-app/RVC_app_state_diagram.png
index 5b8cd90807bae7..a7cf3175aa87ba 100644
Binary files a/examples/rvc-app/RVC_app_state_diagram.png and b/examples/rvc-app/RVC_app_state_diagram.png differ
diff --git a/examples/rvc-app/RVC_app_state_diagram_drawio.xml b/examples/rvc-app/RVC_app_state_diagram_drawio.xml
index 69b82a62543f48..d4f9479b557658 100644
--- a/examples/rvc-app/RVC_app_state_diagram_drawio.xml
+++ b/examples/rvc-app/RVC_app_state_diagram_drawio.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<mxfile host="confluence.dyson.global.corp" modified="2023-09-06T08:28:06.131Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36" etag="EQPGnPqeX5BjbhXApP4w" version="13.5.8" type="atlas"><mxAtlasLibraries/><diagram id="8Tl753pVDSM3c8Mwypsi" name="Page-1">7V3bd6K6Gv9rutbZD7qAcH1Uazud6W3ZzpnT87IXQlRaFAdotfPX7wQTrkFRA7qrMw+VJISQ7/b7vnwJF6A3XV775nxy59nQvZAEe3kBLi8kSdIEEf3BJZ+rEqCQgrHv2KuiVMGT8weSQoGUvjs2DDINQ89zQ2eeLbS82QxaYabM9H1vkW028tzsU+fmmDxRSAqeLNOFhWa/HDucrEp1SUvKv0FnPKFPFlVjVTM1aWPScTAxbW+RKgL9C9DzPS9c/Zoue9DFk0fnZXXfVUltPDAfzsIqN3xqi97rpDd9g0u51x28/OyYf7fIYD9M9528MBls+ElnwPfeZzbEnQgXoLuYOCF8mpsWrl0gmqOySTh10ZWIfhYHRcb5Af0QLlNFZJDX0JvC0P9ETWitYZAZIywjaoLcVlZFi4QGik6aTVLzLxkKbWoSyo/jJySTg36Q+WHP1b3Rf13a7qM7Feeh1fVvtZHckuRtJkvcPFkjbxYSjgeAXF+ZU8fFL97z3n0H+qj7e7jAlY7r9jzX86MHASjaCtRQeRD63htM1RiqBkyVDy0kUc/RAlB2TlECGAxKAEGoiQ7yVkxbgQ4cJkqT9c3zJMuMeVJ1DvP0S79u3cCePrS/T18+/viju6fnlsSYJtVFj+0OM5Ol/n7HOqhrrXiogyr98fA/iIIX+CXQw4Xc77/wBZ43AbNsa0R4thO1Uc3pPKoEQI56pXw8Q3ycr812FETCgLsR9fkyrhua1ts4omgrN0ZNi4eV+flX8lbo1xj/vfSsN8QQZAbQhA5pTYF5oI1MALn0/HDijb2Z6faT0m5WJyZtbj1vTpjqFYbhJ5Fu8z30siyHOM3//B++H6krcvmSrrtcks5XV5/kKghNP+xgu4YKZt4M0rIrBzMHucOmLSzXDALHWhWSJms5PkDUssg0uK+/H7t3xt/g5fXGHj6//b5Uei3C5uiRYxiuEVJAuBrPZRUBEtoC0Inm9qFrhs5H1gKzxIP09ug56DWSJt5oFKDB5eUnfmglkVr39idkATQtp9hi6LPJAIhKbQZAPazIpgU2Jb8lIltJ1pjvSfHuRlkzKspaZcHaizyUx4p2B7M30/TktD+armVRgz9hPZdS4KveSnQ4Qttz/NOZRgA/TUjM/A5C+B3XGc9QWYgZIC69NYfQffQCJ3Q8XDv0wtCbogYurujGpiglb6PoH2oSPawTzFeOCCa+SS9GzhIzX5eM53IShtiD6eCplq4seya0HeTDjBzEpH7bQk+UrmwzNNEfXB6gv54V0p+igMHo1dx3pg4maMv2wpYo6e35bMwDgkt5BC7rba0IwdETGXJPC/kD8LoY6/nh8bF/WZW10CSGWY7KamBiltPqmhSZhOMsRBqk2IusOHVsO9JWLLuR1WAcyGyIEnWWYu0OitpdpD1nHK26lLu0P5VX4DFP5cGH9TBHOiSEqMmj+R7AqgRvFg9KGUCY2BO2dYFLJ0zfhy5jHIl+J3fhCw4mSahok0RtW/wn6Yp2RPiPbWmVzQCwCW4hRBdTFE8xwMGIDqSjAiJKORI5RQ/41lv0JpiElZ3gCAtlWa+6CfMhehlzGPWHX2OOpTQisdK9UC6ZHLle6PKGLY76kqdcpAOrLCXTQl6mCvSj1zKH8W+YSkVbr1TKnCKtRq+oqjZSjksbUWR11kaRwukgb+bDCT973nTuwvBfp5RUjkpJNKipIjic+tC76igavlfaMsjexEVrLSavHTB4GP+wBettEnZ/g5/LNW5/MDdnVTicsAv981cJS0+g+wExecs5NVWxeiiumXn+1HRTdQviz+BKWSDMjXgR8VALjdlykDNduBN7fy3CcLgu5jlahz34GelVoGOJakLfnAUj1BftNXIKsbPl+Xb2ifGN5bImKQpRAKkfZM5sJ5i7JpkvZ+Y69Ekj1zPD3OMZjtLgHRMMoYXZGD57eFUXXd5gEUqkdEXVA7pMTHu1m7mSzuaqbNwnFOsW5Z1XOyWjrniIuINerRT1Gvy8v7+5v64q0V8m6iWqopwPewFQpHOzYS+RFfY6lLghYdNtmSVuujQEKi9xU0Be3FQGGTTW2lJtyQVihQjPl6eDrB2cDhIoVXscw8ADGLxPjzQOrG2VGJDEgbV0HDhGQLxDglpFVENhRNU4cItHIJgytqaBLGNreTO9elFyX8KyTUZ7RFZc4NSAlgZYKX5sqKXWl+InshI8eICtx87Pp8wK46lgLaGAtTSZReqG0RYrhZCHdend9jsrVH1113l8zOLrtcbly4GKQg6BxqK7JDBEXK4NVbCc2iryXVtItZyBTk1VKEbeKWOgUFYGbW1aoi4lURZg67nQnOEQIF0W8GOyK+Qm0jJ6pnBzedvHQeti8yMCtM0uVdPc8M24tGq0LclPFWjnn1m+2xelivn9DmI+JXwjSo3Nbd6TU/KqdDUxha46vm9+ppqRdZHyQceueuwzGsL6sRXvAJk70I/VKBpH4NKuIbbGrEIRS5yqUYg9h0MZBancKpziMu4qo8S/wt0czeaKOBZSPRRStiFjU/7d7qaKbifbaKqkqql0zSwMSawIae3aMs93nDJ/+/0fkV4Vet86g+v+oBQ5nZjixVtc21KVVRI9jsY0o35PL1pW2IID5CId2KGy+sLzuwbKjlAJRKK/LlJzYrKv60JR9JXDiz7VPqcs+qpYMUouqrWR4SDeUj2if/nQ+7Fm489Z8EUVMGL1TQu+VMpx52g9J7hXSMVgBF+bjdXL5fnS+1H9BQZHGCDdxlktpfhGp7PyVuEk7CnSVIw945wyyNsyJXExNoQnm4wGyuXQdj++u/eOkO2OPHsWMOL5605mqM7XyIuS9uPrBjYC1bUCdYM0oDD4L47q2atzUcBVZdM38abD92Cz2eNgl4CS0xkaALHOSCMSlQWBFaMm00RTtfnTBa/onSHIqrnMTMplEbo2DKKe92wVg/320cT5m7dHCijaIy55j2jUqipnBIAP7BJlIQ/t88vLvNaEJS27i02UxQ1rwoU7gAFyQnugNWGlrvzjs89Jow2qWAwzGof2OhW1JrofF/o/gOZUKmrObU+OwxnjQDh6LK+cwxnb+pVHwIwq2NaMA03akxdJV2o+Xyo+E/mIgiVKeTIANw+1mN8Y4dBor/S/w2uVDY15fFqzXqtaDmmqbm6o5LWuXSz5aiBGk2PKxtSW2dTWVdaqSW2nZKrlSObsux7ed03s5BYHt+2apYY7eYS+gzgLrzPuaT3Vqk7wDocACzSz5HiRHD3h/xgC9huOZyqlMb9cwh3Tx6mViw+elIU2WXkpzyDP36RIUu6msoBBnGuv548zBkbbyB1YWjndvrBxOjWgTSiNFzfSdVruVr1sl8qdOZ+nNqkUDH4C1nZ9Mp/xV9ozU+Ucm+M4cIpqnf0PnEJaVtLUDOPue95U3I3aNmQj9U/NdsFFKTM/ZMJKSvra0LO4YKIxkvQAa8GES/iMSQZpR2XU2E6abXyVL5PYJYHCQQiMk1bq2kbDZJTajveIQgbRTkpsqyLVf2Th9dEIqpbFUg+2ZgwFbhn8sl443VtmbMBWWEEIUBfdWd9Q4rSnlhI9i1eOJzK661GpsauYQf48ttCuk8y0c7euHWdPoniGJYuPNW03xM7qzKB5QJyXQ5GzIeSHvd7BKd5hyGuWQ3lBp/KFiXNYcEflq+cJqaqNBgSZdN7/bJsznfN0zudW6Drj+xkN05l5cieP3RKp8PGq4HkCqUstCXG8YJq1u8P87Zts8deB3UKePTTGeaJMAMYDd78s/e9QHrwsvv/oux/et6fBj/9z+DhTXgkII9PK3pAVTfYJfNA38QeWTJccxVcHRj/IFzNBTvUnWDpNc5avxcMpZ9K83CkvyOZ+CuIWjmHmGICS7VTlKy9fR/YLfCAwcpvYm3ZrYgP+Lvcuoh8HZOuX+IbicEWJZ5xR0qzE8/eydyF15JA3ReyGoioFYksHV++8cH0mjFr4bAKtXvN9BNqk5BMJmer8VxIylawPJdAG7G8l0FrWhw/iF8t9+4BrekFOvqpLi2DFnJoUAqji/xUgOJYxv+/7qIttIPfRfMWhVCbTcSom2xOXaos0UVkV90wuoAleBbdPzH1mhVMMKf8gvIsy3V/1kVVcH8++BZflunXEO4rluqaOcsguwTDxYJ0HHjPpUJ4jtt95x/3B4GFwcutsuqHlosvJCflNnHXMJHFdeeesjSxX6Vjg9ueRfrXooJgTeWYogBX+qQ0rUvR6oKWv+IJjgj/zPRnbxvcCEdyP1ls36nPG7sqGYFTb/4CzkA1tc3x8/uL7PgetFoMYNNmyke+9/9KvWzewpw/t79OXjz/+6O7peU2s+hTFId70cnQZ7NpOCeyqoGWtgSBs/MgNvsrnscOZjVwab5GgQlRy5WBWi+oDZARC2sJyzSBwLFpMmlV2RJtOh1c0MZuvTOwV/+T4gito6FJbVaUkmzPrVypCssll2ywMQ89lo6kVjwHawfvsXg370LodDR7DV+v+LhAW4e/DLoLtHPBhjIqLYnl4D1veqDU08dKNMIVBgAxWwFYzp7aCWzCLgOHP8cqcRJe+h0mT8Dp6rwmOoOMW/wA=</diagram></mxfile>
\ No newline at end of file
+<mxfile host="confluence.dyson.global.corp" modified="2023-12-12T16:52:23.893Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36" etag="cysFIm_igNHBgI2WXTH3" version="13.5.8" type="atlas"><mxAtlasLibraries/><diagram id="8Tl753pVDSM3c8Mwypsi" name="Page-1">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</diagram></mxfile>
\ No newline at end of file
diff --git a/examples/rvc-app/rvc-common/include/rvc-device.h b/examples/rvc-app/rvc-common/include/rvc-device.h
index 79d114ab6f1cfa..e77c86aa6a1fb2 100644
--- a/examples/rvc-app/rvc-common/include/rvc-device.h
+++ b/examples/rvc-app/rvc-common/include/rvc-device.h
@@ -24,6 +24,8 @@ class RvcDevice
     bool mDocked   = false;
     bool mCharging = false;
 
+    uint8_t mStateBeforePause = 0;
+
 public:
     /**
      * This class is responsible for initialising all the RVC clusters and manging the interactions between them as required by
diff --git a/examples/rvc-app/rvc-common/src/rvc-device.cpp b/examples/rvc-app/rvc-common/src/rvc-device.cpp
index 2ee199d158a84a..3e62b5f1e6f701 100644
--- a/examples/rvc-app/rvc-common/src/rvc-device.cpp
+++ b/examples/rvc-app/rvc-common/src/rvc-device.cpp
@@ -91,28 +91,47 @@ void RvcDevice::HandleRvcCleanChangeToMode(uint8_t newMode, ModeBase::Commands::
 
 void RvcDevice::HandleOpStatePauseCallback(Clusters::OperationalState::GenericOperationalError & err)
 {
+    // This method is only called if the device is in a Pause-compatible state, i.e. `Running` or `SeekingCharger`.
+    mStateBeforePause = mOperationalStateInstance.GetCurrentOperationalState();
     auto error = mOperationalStateInstance.SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kPaused));
-    if (error == CHIP_NO_ERROR)
-    {
-        err.Set(to_underlying(OperationalState::ErrorStateEnum::kNoError));
-    }
-    else
-    {
-        err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation));
-    }
+    err.Set((error == CHIP_NO_ERROR) ? to_underlying(OperationalState::ErrorStateEnum::kNoError)
+                                     : to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation));
 }
 
 void RvcDevice::HandleOpStateResumeCallback(Clusters::OperationalState::GenericOperationalError & err)
 {
-    auto error = mOperationalStateInstance.SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kRunning));
-    if (error == CHIP_NO_ERROR)
+    uint8_t targetState = to_underlying(OperationalState::OperationalStateEnum::kRunning);
+
+    switch (mOperationalStateInstance.GetCurrentOperationalState())
     {
-        err.Set(to_underlying(OperationalState::ErrorStateEnum::kNoError));
+    case to_underlying(RvcOperationalState::OperationalStateEnum::kCharging):
+    case to_underlying(RvcOperationalState::OperationalStateEnum::kDocked): {
+        if (mRunModeInstance.GetCurrentMode() != RvcRunMode::ModeCleaning &&
+            mRunModeInstance.GetCurrentMode() != RvcRunMode::ModeMapping)
+        {
+            err.Set(to_underlying(OperationalState::ErrorStateEnum::kCommandInvalidInState));
+            return;
+        }
     }
-    else
-    {
-        err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation));
+    break;
+    case to_underlying(OperationalState::OperationalStateEnum::kPaused): {
+        if (mStateBeforePause == to_underlying(RvcOperationalState::OperationalStateEnum::kSeekingCharger))
+        {
+            targetState = to_underlying(RvcOperationalState::OperationalStateEnum::kSeekingCharger);
+        }
     }
+    break;
+    default:
+        // This method is only called if the device is in a resume-compatible state, i.e. `Charging`, `Docked` or
+        // `Paused`. Therefor, we do not expect to ever enter this branch.
+        err.Set(to_underlying(OperationalState::ErrorStateEnum::kCommandInvalidInState));
+        return;
+    }
+
+    auto error = mOperationalStateInstance.SetOperationalState(targetState);
+
+    err.Set((error == CHIP_NO_ERROR) ? to_underlying(OperationalState::ErrorStateEnum::kNoError)
+                                     : to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation));
 }
 
 void RvcDevice::HandleChargedMessage()