diff --git a/include/icsneo/device/device.h b/include/icsneo/device/device.h
index cb4c232..6567f06 100644
--- a/include/icsneo/device/device.h
+++ b/include/icsneo/device/device.h
@@ -23,7 +23,8 @@ class Device {
 public:
 	virtual ~Device() {
 		destructing = true;
-		disableMessagePolling();
+		if(isMessagePollingEnabled())
+			disableMessagePolling();
 		close();
 	}