diff --git a/Tests/test_file_fits.py b/Tests/test_file_fits.py
index d2f5a6d17..3048827e0 100644
--- a/Tests/test_file_fits.py
+++ b/Tests/test_file_fits.py
@@ -44,6 +44,12 @@ def test_naxis_zero():
             pass
 
 
+def test_comment():
+    image_data = b"SIMPLE  =                    T / comment string"
+    with pytest.raises(OSError):
+        FitsImagePlugin.FitsImageFile(BytesIO(image_data))
+
+
 def test_stub_deprecated():
     class Handler:
         opened = False
diff --git a/src/PIL/FitsImagePlugin.py b/src/PIL/FitsImagePlugin.py
index 1185ef2d3..1359aeb12 100644
--- a/src/PIL/FitsImagePlugin.py
+++ b/src/PIL/FitsImagePlugin.py
@@ -32,7 +32,7 @@ class FitsImageFile(ImageFile.ImageFile):
             keyword = header[:8].strip()
             if keyword == b"END":
                 break
-            value = header[8:].strip()
+            value = header[8:].split(b"/")[0].strip()
             if value.startswith(b"="):
                 value = value[1:].strip()
             if not headers and (not _accept(keyword) or value != b"T"):