diff --git a/include/aoclient.h b/include/aoclient.h
index 598ead6..be39612 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -55,6 +55,7 @@ class AOClient : public QObject {
           joined(false), current_area(0), current_char(""), socket(p_socket), server(p_server),
           is_partial(false), last_wtce_time(0) {
         afk_timer = new QTimer;
+        afk_timer->setSingleShot(true);
         connect(afk_timer, SIGNAL(timeout()), this, SLOT(onAfkTimeout()));
     };
 
diff --git a/src/aoclient.cpp b/src/aoclient.cpp
index 55f1a58..7e37fef 100644
--- a/src/aoclient.cpp
+++ b/src/aoclient.cpp
@@ -326,7 +326,6 @@ void AOClient::onAfkTimeout()
 {
     sendServerMessage("You are now AFK.");
     is_afk = true;
-    afk_timer->stop();
 }
 
 AOClient::~AOClient() {