diff --git a/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/ListenParams.java b/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/ListenParams.java
index f06426ffe60..83e47b65d9e 100644
--- a/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/ListenParams.java
+++ b/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/ListenParams.java
@@ -29,4 +29,34 @@ public ListenParams(final ReadValueId readValueId) {
     public abstract long getQueueSize();
 
     public abstract boolean getDiscardOldest();
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + (getDiscardOldest() ? 1231 : 1237);
+        result = prime * result + (int) (getQueueSize() ^ (getQueueSize() >>> 32));
+        long temp;
+        temp = Double.doubleToLongBits(getSamplingInterval());
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj == null)
+            return false;
+        if (this == obj)
+            return true;
+        if (!super.equals(obj))
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        SingleNodeListenParams other = (SingleNodeListenParams) obj;
+        if (getDiscardOldest() != other.getDiscardOldest())
+            return false;
+        if (getQueueSize() != other.getQueueSize())
+            return false;
+        return Double.doubleToLongBits(getSamplingInterval()) == Double.doubleToLongBits(other.getSamplingInterval());
+    }
 }
diff --git a/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/SingleNodeListenParams.java b/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/SingleNodeListenParams.java
index 7485d008210..7989a6a163b 100644
--- a/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/SingleNodeListenParams.java
+++ b/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/SingleNodeListenParams.java
@@ -56,34 +56,4 @@ public boolean getDiscardOldest() {
         return discardOldest;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + (discardOldest ? 1231 : 1237);
-        result = prime * result + (int) (queueSize ^ (queueSize >>> 32));
-        long temp;
-        temp = Double.doubleToLongBits(samplingInterval);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        SingleNodeListenParams other = (SingleNodeListenParams) obj;
-        if (discardOldest != other.discardOldest)
-            return false;
-        if (queueSize != other.queueSize)
-            return false;
-        if (Double.doubleToLongBits(samplingInterval) != Double.doubleToLongBits(other.samplingInterval))
-            return false;
-        return true;
-    }
-
 }
diff --git a/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/SubtreeNodeListenParams.java b/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/SubtreeNodeListenParams.java
index 2de4a46a41e..d42180f2505 100644
--- a/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/SubtreeNodeListenParams.java
+++ b/kura/org.eclipse.kura.driver.opcua.provider/src/main/java/org/eclipse/kura/internal/driver/opcua/request/SubtreeNodeListenParams.java
@@ -35,34 +35,4 @@ public long getQueueSize() {
     public boolean getDiscardOldest() {
         return rootParams.getDiscardOldest();
     }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + (getDiscardOldest() ? 1231 : 1237);
-        result = prime * result + (int) (getQueueSize() ^ (getQueueSize() >>> 32));
-        long temp;
-        temp = Double.doubleToLongBits(getSamplingInterval());
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        SingleNodeListenParams other = (SingleNodeListenParams) obj;
-        if (getDiscardOldest() != other.getDiscardOldest())
-            return false;
-        if (getQueueSize() != other.getQueueSize())
-            return false;
-        if (Double.doubleToLongBits(getSamplingInterval()) != Double.doubleToLongBits(other.getSamplingInterval()))
-            return false;
-        return true;
-    }
 }