diff --git a/src/commands/casing.cpp b/src/commands/casing.cpp
index f7050ea..a83cb94 100644
--- a/src/commands/casing.cpp
+++ b/src/commands/casing.cpp
@@ -107,7 +107,6 @@ void AOClient::cmdTestify(int argc, QStringList argv)
     }
     else {
         clearTestimony();
-        area->statement = 0;
         area->test_rec = AreaData::TestimonyRecording::RECORDING;
         sendServerMessage("Started testimony recording.");
     }
@@ -157,6 +156,7 @@ void AOClient::cmdDeleteStatement(int argc, QStringList argv)
     }
     if (c_statement > 0 && area->testimony.size() > 2) {
         area->testimony.remove(c_statement);
+        area->statement = c_statement - 1;
         sendServerMessage("The statement with id " + QString::number(c_statement) + " has been deleted from the testimony.");
     }
 }
diff --git a/src/packets.cpp b/src/packets.cpp
index 98e25af..c054609 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -718,7 +718,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
         if (args[5] != "wit")
             return AOPacket("MS", args);
 
-        if (area->statement == 0) {
+        if (area->statement == -1) {
             args[4] = "~~\\n-- " + args[4] + " --";
             args[14] = "3";
             server->broadcast(AOPacket("RT",{"testimony1"}), current_area);
diff --git a/src/testimony_recorder.cpp b/src/testimony_recorder.cpp
index 01178b5..312ebf9 100644
--- a/src/testimony_recorder.cpp
+++ b/src/testimony_recorder.cpp
@@ -23,15 +23,15 @@ void AOClient::addStatement(QStringList packet)
 {
     AreaData* area = server->areas[current_area];
     int c_statement = area->statement;
-    if (c_statement >= 0) {
+    if (c_statement >= -1) {
         if (area->test_rec == AreaData::TestimonyRecording::RECORDING) {
             if (c_statement <= server->maximum_statements) {
-                if (c_statement == 0)
+                if (c_statement == -1)
                     packet[14] = "3";
                 else
                     packet[14] = "1";
-                area->testimony.append(packet);
                 area->statement = c_statement + 1;
+                area->testimony.append(packet);
                 return;
             }
             else {
@@ -70,6 +70,7 @@ void AOClient::clearTestimony()
 {
     AreaData* area = server->areas[current_area];
     area->test_rec = AreaData::TestimonyRecording::STOPPED;
+    area->statement = -1;
     area->testimony.clear(); //!< Empty out the QVector
     area->testimony.squeeze(); //!< Release memory. Good idea? God knows, I do not.
 }