diff --git a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/integration/AbstractReplicableWithObjectInputStream.java b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/integration/AbstractReplicableWithObjectInputStream.java
index 4c53ede9a41..67147a638d4 100644
--- a/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/integration/AbstractReplicableWithObjectInputStream.java
+++ b/java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/integration/AbstractReplicableWithObjectInputStream.java
@@ -3,6 +3,7 @@ package com.sap.sailing.windestimation.integration;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -105,7 +106,7 @@ public abstract class AbstractReplicableWithObjectInputStream<S, O extends Opera
 
     @Override
     public ObjectInputStream createObjectInputStreamResolvingAgainstCache(InputStream is) throws IOException {
-        ObjectInputStream ois = new ObjectInputStream(is);
+        ObjectInputStream ois = new BundleObjectInputStream(is);
         return ois;
     }
 
@@ -139,4 +140,24 @@ public abstract class AbstractReplicableWithObjectInputStream<S, O extends Opera
         this.operationsSentToMasterForReplication.add(operation);
     }
 
+    /**
+     * Custom {@link ObjectInputStream} which is necessary in OSGI context in order to load the class
+     * {@link WindEstimationModelsUpdateOperation} without {@link ClassNotFoundException}.
+     * 
+     * @author Vladislav Chumak (D069712)
+     *
+     */
+    private class BundleObjectInputStream extends ObjectInputStream {
+
+        public BundleObjectInputStream(InputStream in) throws IOException {
+            super(in);
+        }
+
+        @Override
+        protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+            return super.resolveClass(desc);
+        }
+
+    }
+
 }