diff --git a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic1XStrategy.java b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic1XStrategy.java
index 937c1e79..789959b8 100644
--- a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic1XStrategy.java
+++ b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic1XStrategy.java
@@ -39,4 +39,10 @@ public boolean wrapNestedSortPathInObject()
     {
         return false;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return false;
+    }
 }
diff --git a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic2XStrategy.java b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic2XStrategy.java
index 3ae96b83..5ab89cfb 100644
--- a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic2XStrategy.java
+++ b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic2XStrategy.java
@@ -22,4 +22,10 @@ public boolean wrapNestedSortPathInObject()
     {
         return false;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return false;
+    }
 }
diff --git a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic5XStrategy.java b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic5XStrategy.java
index 4b9ab2c1..05a4b0c1 100644
--- a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic5XStrategy.java
+++ b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic5XStrategy.java
@@ -8,4 +8,10 @@ public boolean wrapNestedSortPathInObject()
     {
         return false;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return false;
+    }
 }
diff --git a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic6XStrategy.java b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic6XStrategy.java
index c7e83b61..77e5e802 100644
--- a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic6XStrategy.java
+++ b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/Elastic6XStrategy.java
@@ -8,4 +8,10 @@ public boolean supportsTypes()
     {
         return false;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return false;
+    }
 }
diff --git a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticStrategy.java b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticStrategy.java
index 900f109b..c16b1319 100644
--- a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticStrategy.java
+++ b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticStrategy.java
@@ -19,4 +19,7 @@ interface ElasticStrategy
 
     /** Returns whether this elastic needs the nested sort path in a nested object or a plain property */
     boolean wrapNestedSortPathInObject();
+
+    /** Returns true if this elastic supports data streams or not. */
+    boolean supportsDataStreams();
 }
diff --git a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticsearchMetaUtils.java b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticsearchMetaUtils.java
index ab3e29cd..b3281e74 100644
--- a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticsearchMetaUtils.java
+++ b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/ElasticsearchMetaUtils.java
@@ -156,8 +156,12 @@ static ElasticsearchMeta getMeta(IQuerySession session, String catalogAlias, Str
                         }
                     }
 
-                    // Fetch data stream mappings
-                    appendDataStreamMappings(session, catalogAlias, endpoint, index, result);
+                    if (version.getStrategy()
+                            .supportsDataStreams())
+                    {
+                        // Fetch data stream mappings
+                        appendDataStreamMappings(session, catalogAlias, endpoint, index, result);
+                    }
 
                     return new ElasticsearchMeta(version, result);
                 });
diff --git a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/GenericStrategy.java b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/GenericStrategy.java
index a5ca0d28..329613d2 100644
--- a/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/GenericStrategy.java
+++ b/payloadbuilder-catalog/src/main/java/se/kuseman/payloadbuilder/catalog/es/GenericStrategy.java
@@ -43,4 +43,10 @@ public boolean wrapNestedSortPathInObject()
     {
         return true;
     }
+
+    @Override
+    public boolean supportsDataStreams()
+    {
+        return true;
+    }
 }