diff --git a/implementation/src/main/java/io/smallrye/mutiny/infrastructure/Infrastructure.java b/implementation/src/main/java/io/smallrye/mutiny/infrastructure/Infrastructure.java
index e1318d92b..c2e820d19 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/infrastructure/Infrastructure.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/infrastructure/Infrastructure.java
@@ -77,7 +77,7 @@ public static void setDefaultExecutor(Executor s) {
             DEFAULT_SCHEDULER.shutdownNow();
         }
         DEFAULT_EXECUTOR = s;
-        DEFAULT_SCHEDULER = new MutinyScheduler(s);
+        DEFAULT_SCHEDULER = (s instanceof ScheduledExecutorService) ? (ScheduledExecutorService) s : new MutinyScheduler(s);
     }
 
     public static ScheduledExecutorService getDefaultWorkerPool() {
@@ -286,7 +286,7 @@ public static boolean canCallerThreadBeBlocked() {
 
     /**
      * Defines a custom dropped exception handler.
-     * 
+     *
      * @param handler the handler, must not be {@code null} and must not throw an exception or it will also be lost.
      */
     public static void setDroppedExceptionHandler(Consumer<Throwable> handler) {
@@ -361,7 +361,7 @@ public static <T> Predicate<T> decorate(Predicate<T> predicate) {
 
     /**
      * Log from an operator.
-     *
+     * <p>
      * This method should never be called directly but only from {@link Multi#log(String)} and {@link Uni#log(String)}.
      *
      * @param identifier the event identifier
@@ -375,7 +375,7 @@ public static void logFromOperator(String identifier, String event, Object value
 
     /**
      * Defines operator logging behavior for {@link Multi#log(String)} and {@link Uni#log(String)}.
-     * 
+     *
      * @param operatorLogger the new operator logger
      */
     public static void setOperatorLogger(OperatorLogger operatorLogger) {
@@ -395,7 +395,7 @@ public interface OperatorLogger {
 
         /**
          * Actual logging behavior.
-         * 
+         *
          * @param identifier the event identifier
          * @param event the event as a string
          * @param value the value, if any or {@code null}