diff --git a/zappa/handler.py b/zappa/handler.py
index 78a31cfda..8d49245f5 100644
--- a/zappa/handler.py
+++ b/zappa/handler.py
@@ -1,5 +1,4 @@
 import base64
-import boto3
 import collections
 import datetime
 import importlib
@@ -8,10 +7,11 @@
 import logging
 import os
 import sys
-import traceback
 import tarfile
-
+import traceback
 from builtins import str
+
+import boto3
 from werkzeug.wrappers import Response
 
 # This file may be copied into a project's root,
@@ -549,11 +549,9 @@ def handler(self, event, context):
                         zappa_returndict.setdefault('statusDescription', response.status)
 
                     if response.data:
-                        if settings.BINARY_SUPPORT and \
-                                not response.mimetype.startswith("text/") \
-                                and response.mimetype != "application/json":
+                        if settings.BINARY_SUPPORT:
                             zappa_returndict['body'] = base64.b64encode(response.data).decode('utf-8')
-                            zappa_returndict["isBase64Encoded"] = True
+                            zappa_returndict['isBase64Encoded'] = True
                         else:
                             zappa_returndict['body'] = response.get_data(as_text=True)