diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc94dc82e0..d7211081bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -243,7 +243,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Fixed `--gpus` default for parser returned by `Trainer.add_argparse_args` ([#6898](https://github.com/PyTorchLightning/pytorch-lightning/pull/6898))
 
 
-- Fixed `AttributeError for `require_backward_grad_sync` when running manual optimization with sharded plugin ([#6915](https://github.com/PyTorchLightning/pytorch-lightning/pull/6915))
+- Fixed pickle error checker to now check for `pickle.PickleError` to catch all pickle errors ([#6917](https://github.com/PyTorchLightning/pytorch-lightning/pull/6917)) 
+
+
+- Fixed `AttributeError` for `require_backward_grad_sync` when running manual optimization with sharded plugin ([#6915](https://github.com/PyTorchLightning/pytorch-lightning/pull/6915))
 
 
 - Fixed multi-gpu join for Horovod ([#6954](https://github.com/PyTorchLightning/pytorch-lightning/pull/6954))
diff --git a/pytorch_lightning/utilities/parsing.py b/pytorch_lightning/utilities/parsing.py
index dd12f34cfe..fabb853d4f 100644
--- a/pytorch_lightning/utilities/parsing.py
+++ b/pytorch_lightning/utilities/parsing.py
@@ -61,7 +61,7 @@ def is_picklable(obj: object) -> bool:
     try:
         pickle.dumps(obj)
         return True
-    except (pickle.PicklingError, AttributeError):
+    except (pickle.PickleError, AttributeError):
         return False
 
 
diff --git a/tests/utilities/test_parsing.py b/tests/utilities/test_parsing.py
index 6ea10adf3d..9c6900f81f 100644
--- a/tests/utilities/test_parsing.py
+++ b/tests/utilities/test_parsing.py
@@ -15,6 +15,8 @@ import inspect
 
 import pytest
 
+from torch.jit import ScriptModule
+
 from pytorch_lightning.utilities.parsing import (
     AttributeDict,
     clean_namespace,
@@ -203,7 +205,7 @@ def test_is_picklable(tmpdir):
         pass
 
     true_cases = [None, True, 123, "str", (123, "str"), max]
-    false_cases = [unpicklable_function, UnpicklableClass]
+    false_cases = [unpicklable_function, UnpicklableClass, ScriptModule()]
 
     for case in true_cases:
         assert is_picklable(case) is True