diff --git a/slsReceiverSoftware/src/Arping.cpp b/slsReceiverSoftware/src/Arping.cpp
index a476dba39..01330a216 100644
--- a/slsReceiverSoftware/src/Arping.cpp
+++ b/slsReceiverSoftware/src/Arping.cpp
@@ -14,6 +14,15 @@ namespace sls {
 #define gettid() syscall(SYS_gettid)
 #endif
 
+
+Arping::Arping(){}
+
+Arping::~Arping() {
+    if (IsRunning()) {
+        StopThread();
+    }
+}
+
 void Arping::SetInterfacesAndIps(const int index, const std::string &interface,
                                  const std::string &ip) {
 
diff --git a/slsReceiverSoftware/src/Arping.h b/slsReceiverSoftware/src/Arping.h
index 80af8d1c5..4a4571605 100644
--- a/slsReceiverSoftware/src/Arping.h
+++ b/slsReceiverSoftware/src/Arping.h
@@ -17,6 +17,9 @@ namespace sls {
 class Arping {
 
   public:
+    Arping();
+    ~Arping();
+
     void SetInterfacesAndIps(const int index, const std::string &interface,
                              const std::string &ip);
     pid_t GetThreadId() const;