diff --git a/src/template_db/dispatcher.cc b/src/template_db/dispatcher.cc
index 73ce0136e..732f1b063 100644
--- a/src/template_db/dispatcher.cc
+++ b/src/template_db/dispatcher.cc
@@ -782,8 +782,13 @@ void Dispatcher::standby_loop(uint64 milliseconds)
 	connection_per_pid[client_pid]->send_result(command);
 	*(uint32*)(dispatcher_shm_ptr + 2*sizeof(uint32)) = client_pid;
       }
-      else if (command == PING)
-	prolongate(client_pid);
+// Ping-Feature removed. The concept of unassured messages doesn't fit in the context of strict
+// two-directional communication.
+//       else if (command == PING)
+//       {
+// 	prolongate(client_pid);
+// 	connection_per_pid[client_pid]->send_result(0);
+//       }
     }
     catch (File_Error e)
     {
@@ -1170,7 +1175,9 @@ void Dispatcher_Client::purge(uint32 pid)
 
 void Dispatcher_Client::ping()
 {
-  send_message(Dispatcher::PING, "Dispatcher_Client::ping::socket");
+// Ping-Feature removed. The concept of unassured messages doesn't fit in the context of strict
+// two-directional communication.
+//   send_message(Dispatcher::PING, "Dispatcher_Client::ping::socket");
 }
 
 void Dispatcher_Client::terminate()