diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua
index b2da689e89..d1957b2129 100644
--- a/mods/bucket/init.lua
+++ b/mods/bucket/init.lua
@@ -99,7 +99,11 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 						return
 					end
 				end
-				return {name="bucket:bucket_empty"}
+				if not minetest.setting_getbool("creative_mode") then
+					return {name="bucket:bucket_empty"}
+				else
+					return {name=itemname}
+				end
 			end
 		})
 	end