diff --git a/akka-docs/rst/java/code/docs/persistence/PersistenceDocTest.java b/akka-docs/rst/java/code/docs/persistence/PersistenceDocTest.java
index 6c6344c4a4..67bbb213ab 100644
--- a/akka-docs/rst/java/code/docs/persistence/PersistenceDocTest.java
+++ b/akka-docs/rst/java/code/docs/persistence/PersistenceDocTest.java
@@ -143,14 +143,15 @@ public class PersistenceDocTest {
           
             @Override
             public void onReceiveRecover(Object message) {
+	      if (message instanceof RecoveryCompleted) {
+	          recoveryCompleted();
+	      }
               // ...
             }
             
             @Override
             public void onReceiveCommand(Object message) throws Exception {
-                if (message instanceof RecoveryCompleted) {
-                    recoveryCompleted();
-                } else if (message instanceof String) {
+                if (message instanceof String) {
                   // ...
                 } else {
                     unhandled(message);
diff --git a/akka-docs/rst/scala/code/docs/persistence/PersistenceDocSpec.scala b/akka-docs/rst/scala/code/docs/persistence/PersistenceDocSpec.scala
index 942906681c..f440507302 100644
--- a/akka-docs/rst/scala/code/docs/persistence/PersistenceDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/persistence/PersistenceDocSpec.scala
@@ -92,11 +92,11 @@ trait PersistenceDocSpec {
       //#recovery-completed
 
       def receiveRecover: Receive = {
+        case RecoveryCompleted => recoveryCompleted()
         case evt => //...
       }
 
       def receiveCommand: Receive = {
-        case RecoveryCompleted => recoveryCompleted()
         case msg               => //...
       }
 
diff --git a/akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java b/akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java
index 13391ae8a3..b8ec3e735b 100644
--- a/akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java
+++ b/akka-samples/akka-sample-persistence-java-lambda/src/main/java/doc/LambdaPersistenceDocTest.java
@@ -146,14 +146,14 @@ public class LambdaPersistenceDocTest {
 
       @Override public PartialFunction<Object, BoxedUnit> receiveRecover() {
         return ReceiveBuilder.
+          match(RecoveryCompleted.class, r -> {
+            recoveryCompleted();
+          }).
           match(String.class, this::handleEvent).build();
       }
 
       @Override public PartialFunction<Object, BoxedUnit> receiveCommand() {
         return ReceiveBuilder.
-          match(RecoveryCompleted.class, r -> {
-            recoveryCompleted();
-          }).
           match(String.class, s -> s.equals("cmd"),
             s -> persist("evt", this::handleEvent)).build();
       }