diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 824f7dc8a..e98ec6e96 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -468,7 +468,12 @@ void updateFastFaceRow(
 				end_of_texture = true;
 		}
 		
-		end_of_texture = true; //DEBUG
+		// Do this to disable tiling textures
+		//end_of_texture = true; //DEBUG
+		
+		// Disable tiling of textures if smooth lighting is used
+		if(smooth_lighting)
+			end_of_texture = true;
 		
 		if(next_is_different || end_of_texture)
 		{