diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 3092a47a5fa..66a8e473ef3 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -202,6 +202,9 @@
 				continue
 			else
 
+				if(!L.client)
+					continue
+					
 				if(L.stat == CONSCIOUS)
 					if (dist < nearest_dist)
 						nearest_target = L
@@ -562,4 +565,4 @@
 
 
 #undef BEARMODE_INDOORS
-#undef BEARMODE_SPACE
\ No newline at end of file
+#undef BEARMODE_SPACE
diff --git a/html/changelogs/alberky-PR-1038.yml b/html/changelogs/alberky-PR-1038.yml
new file mode 100644
index 00000000000..3da991262eb
--- /dev/null
+++ b/html/changelogs/alberky-PR-1038.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - tweak: "Space bears should not attack ssd players anymore."
diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi
index 1942fc57a09..03ba3f85b1a 100644
Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ