diff --git a/atomos/src/main/java/org/apache/felix/atomos/impl/modules/ConnectContentModule.java b/atomos/src/main/java/org/apache/felix/atomos/impl/modules/ConnectContentModule.java
index aafaf6c..da389b1 100644
--- a/atomos/src/main/java/org/apache/felix/atomos/impl/modules/ConnectContentModule.java
+++ b/atomos/src/main/java/org/apache/felix/atomos/impl/modules/ConnectContentModule.java
@@ -27,6 +27,7 @@
 
 public class ConnectContentModule implements ConnectContent
 {
+	static final ClassLoader platformLoader = ClassLoader.getPlatformClassLoader();
     final Module module;
     final ModuleReference reference;
     final AtomosLayerModules atomosLayer;
@@ -61,7 +62,7 @@
     @Override
     public Optional<ClassLoader> getClassLoader()
     {
-        return Optional.ofNullable(module.getClassLoader());
+        return Optional.ofNullable(module.getClassLoader()).or(() -> Optional.of(ConnectContentModule.platformLoader));
     }
 
     @Override