diff --git a/src/devcenter/HISTORY.rst b/src/devcenter/HISTORY.rst
index 9c9a62817ef..662045da9c3 100644
--- a/src/devcenter/HISTORY.rst
+++ b/src/devcenter/HISTORY.rst
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+5.0.1
+++++++
+* Fix bug in "az devcenter dev environment show-logs-by-operation" if logs is not in JSON format
+
 5.0.0
 ++++++
 * Require roles and identity type parameters in "az decenter admin project-environment-type create"
diff --git a/src/devcenter/azext_devcenter/action.py b/src/devcenter/azext_devcenter/action.py
index 51d04779e0e..327d9c27e71 100644
--- a/src/devcenter/azext_devcenter/action.py
+++ b/src/devcenter/azext_devcenter/action.py
@@ -8,7 +8,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 # pylint: disable=protected-access
-
+# pylint: disable=no-self-use
 
 import argparse
 from collections import defaultdict
diff --git a/src/devcenter/azext_devcenter/custom.py b/src/devcenter/azext_devcenter/custom.py
index 33c3e9465c4..f00e2ae48c6 100644
--- a/src/devcenter/azext_devcenter/custom.py
+++ b/src/devcenter/azext_devcenter/custom.py
@@ -1205,8 +1205,12 @@ def devcenter_environment_operation_show_logs_by_operation(
     )
     logs_array = []
     for log in logs:
-        logs_string = json.loads(log)
-        logs_array.append(logs_string)
+        if log:
+            try:
+                logs_string = json.loads(log)
+                logs_array.append(logs_string)
+            except json.JSONDecodeError:
+                logs_array.append(log)
     return logs_array
 
 
diff --git a/src/devcenter/setup.py b/src/devcenter/setup.py
index bee3d7f8602..93055dcc140 100644
--- a/src/devcenter/setup.py
+++ b/src/devcenter/setup.py
@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages
 
 # HISTORY.rst entry.
-VERSION = '5.0.0'
+VERSION = '5.0.1'
 try:
     from azext_devcenter.manual.version import VERSION
 except ImportError: