diff --git a/analyzers/Yeti/Yeti.json b/analyzers/Yeti/Yeti.json
index baddf0173..1f09fb1de 100644
--- a/analyzers/Yeti/Yeti.json
+++ b/analyzers/Yeti/Yeti.json
@@ -22,6 +22,14 @@
       "type": "string",
       "multi": false,
       "required": false
+    },
+    {
+      "name": "verify_ssl",
+      "description": "Verify SSL certificate",
+      "type": "boolean",
+      "multi": false,
+      "required": true,
+      "defaultValue": true
     }
   ]
 }
diff --git a/analyzers/Yeti/requirements.txt b/analyzers/Yeti/requirements.txt
index aca4b34a9..931afd991 100644
--- a/analyzers/Yeti/requirements.txt
+++ b/analyzers/Yeti/requirements.txt
@@ -1,2 +1,2 @@
 cortexutils
-git+https://github.com/yeti-platform/pyeti ; python_version<='2.7'
+git+https://github.com/yeti-platform/pyeti
diff --git a/analyzers/Yeti/yeti.py b/analyzers/Yeti/yeti.py
index 01dd37989..c30f8581c 100755
--- a/analyzers/Yeti/yeti.py
+++ b/analyzers/Yeti/yeti.py
@@ -10,6 +10,7 @@ def __init__(self):
         Analyzer.__init__(self)
         self.url = self.get_param('config.url', None, 'Missing URL for Yeti API')
         self.api_key = self.get_param('config.api_key')
+        self.verify_ssl = self.get_param("config.verify_ssl", True, None)
 
     def summary(self, raw):
         count = len(raw.get('findings', []))
@@ -26,15 +27,12 @@ def summary(self, raw):
         return result
 
     def run(self):
-        api = pyeti.YetiApi("{}/api/".format(self.url), api_key=self.api_key)
+        api = pyeti.YetiApi("{}/api/".format(self.url), api_key=self.api_key, verify_ssl=self.verify_ssl)
         data = self.get_data()
 
         try:
             result = api.observable_search(value=data)
 
-            if not result:
-                self.error('Service unavailable, please check if Yeti server is running')
-
             self.report({
                 'findings': result
             })