diff --git a/lib/converter.cpp b/lib/converter.cpp
index a85ccbcc..8f794f4c 100644
--- a/lib/converter.cpp
+++ b/lib/converter.cpp
@@ -132,6 +132,10 @@ namespace Converter {
             return;
           }
           encoderCommand << "-vcodec " << vidCodec->first << " ";
+          if (parameters["video"]["codec"].asString() == "h264"){
+            //Enforce baseline
+             ecncoderCommand << "-preset slow -profile:v baseline -level 30 ";
+          }
           if (parameters["video"].isMember("fpks")){
             encoderCommand << "-r " << parameters["video"]["fpks"].asInt() / 1000 << " "; 
           }