diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index 7226abd0b..3ce8731e7 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -176,6 +176,12 @@ bool AdminModule::handleReceivedProtobuf(const MeshPacket &mp, AdminMessage *r)
         }
         break;
     }
+    
+    // If asked for a response and it is not yet set, generate an 'ACK' response
+    if (mp.decoded.want_response && !myReply) {
+        myReply = allocErrorResponse(Routing_Error_NONE, &mp);
+    }
+
     return handled;
 }
 
diff --git a/src/modules/AdminModule.h b/src/modules/AdminModule.h
index 3afbfa133..369bcc60b 100644
--- a/src/modules/AdminModule.h
+++ b/src/modules/AdminModule.h
@@ -2,7 +2,7 @@
 #include "ProtobufModule.h"
 
 /**
- * Routing module for router control messages
+ * Admin module for admin messages
  */
 class AdminModule : public ProtobufModule<AdminMessage>
 {