diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 440cf5bb1a..650d607f03 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -40,6 +40,9 @@ static const SpriteID * const _landscape_spriteindexes[] = {
 	_landscape_spriteindexes_toyland,
 };
 
+/** file index of first user-added GRF file */
+int _first_user_grf_file_index;
+
 /**
  * Load an old fashioned GRF file.
  * @param filename   The name of the file to open.
@@ -224,6 +227,8 @@ static void LoadSpriteTables()
 
 	LoadNewGRF(SPR_NEWGRFS_BASE, i);
 
+	_first_user_grf_file_index = i + 1;
+
 	/* Free and remove the top element. */
 	delete master;
 	_grfconfig = top;
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index d3046e7fbe..b363da0858 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -34,6 +34,7 @@
 #include "company_gui.h"
 #include "object_map.h"
 #include "tracerestrict.h"
+#include "spritecache.h"
 
 #include "table/strings.h"
 #include "table/railtypes.h"
@@ -1870,6 +1871,8 @@ static void DrawSingleSignal(TileIndex tile, const RailtypeInfo *rti, Track trac
 		sprite = (type == SIGTYPE_NORMAL && variant == SIG_ELECTRIC) ? SPR_ORIGINAL_SIGNALS_BASE : SPR_SIGNALS_BASE - 16;
 		sprite += type * 16 + variant * 64 + image * 2 + condition + (type > SIGTYPE_LAST_NOPBS ? 64 : 0);
 	}
+	extern uint _first_user_grf_file_index;
+	if (!is_custom_sprite) is_custom_sprite = (GetOriginFileSlot(sprite) >= _first_user_grf_file_index);
 
 	if (!is_custom_sprite && variant == SIG_ELECTRIC && IsRestrictedSignal(tile) && GetExistingTraceRestrictProgram(tile, track) != NULL) {
 		if (type == SIGTYPE_PBS || type == SIGTYPE_PBS_ONEWAY) {