diff --git a/simulations/radioactive_decays/include/OMSimDecaysGPS.hh b/simulations/radioactive_decays/include/OMSimDecaysGPS.hh
index 69ce1e139..8a6db1419 100644
--- a/simulations/radioactive_decays/include/OMSimDecaysGPS.hh
+++ b/simulations/radioactive_decays/include/OMSimDecaysGPS.hh
@@ -32,6 +32,7 @@ public:
   void setOpticalModule(OMSimOpticalModule *p_opticalModule) { m_opticalModule = p_opticalModule; };
   void setProductionRadius(G4double pProductionRadius);
   G4String getDecayTerminationNuclide();
+  G4ThreeVector sampleNextDecayPosition(G4ThreeVector p_currentPosition);
 
 private:
   // Define a map that maps isotopes to their GPS commands
diff --git a/simulations/radioactive_decays/src/OMSimDecaysGPS.cc b/simulations/radioactive_decays/src/OMSimDecaysGPS.cc
index 1a995c1c2..fb9e51a01 100644
--- a/simulations/radioactive_decays/src/OMSimDecaysGPS.cc
+++ b/simulations/radioactive_decays/src/OMSimDecaysGPS.cc
@@ -3,6 +3,8 @@
 #include "OMSimUIinterface.hh"
 #include <G4SystemOfUnits.hh>
 #include <G4Poisson.hh>
+#include <G4Navigator.hh>
+#include "G4TransportationManager.hh"
 
 void OMSimDecaysGPS::setProductionRadius(G4double p_productionRadius)
 {
@@ -31,7 +33,7 @@ void OMSimDecaysGPS::generalGPS()
     ui.applyCommand("/run/initialize");
     ui.applyCommand("/gps/particle ion");
     G4ThreeVector position = m_opticalModule->m_placedPositions.at(0);
-    ui.applyCommand("/gps/pos/centre ", position.x()/m, " ", position.y()/m, " ", position.z()/m, " m");
+    ui.applyCommand("/gps/pos/centre ", position.x() / m, " ", position.y() / m, " ", position.z() / m, " m");
     ui.applyCommand("/gps/ene/mono 0 eV");
     ui.applyCommand("/gps/pos/type Volume");
     ui.applyCommand("/gps/pos/shape Sphere");
@@ -146,10 +148,56 @@ void OMSimDecaysGPS::simulateDecaysInPMTs(G4double p_timeWindow)
             G4int decayCount = pair.second;
             m_nuclideStopName = m_terminationIsotopes[pair.first];
 
-            configureIsotopeGPS(isotope, "PMT"+std::to_string(pmt));
+            configureIsotopeGPS(isotope, "PMT_" + std::to_string(pmt));
 
             log_trace("Simulating {} decays of {} in PMT {}", decayCount, isotope, pmt);
             ui.runBeamOn(decayCount);
         }
     }
 }
+
+G4ThreeVector OMSimDecaysGPS::sampleNextDecayPosition(G4ThreeVector p_currentPosition)
+{
+    G4Navigator *navigator = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking();
+    G4VPhysicalVolume *currentVolume = navigator->LocateGlobalPointAndSetup(p_currentPosition, nullptr, true);
+    G4ThreeVector centreOfVolume = currentVolume->GetTranslation();
+
+    if (!currentVolume)
+    {
+        G4Exception("sampleNextDecayPosition", "NoVolume", FatalException,
+                    "Mother isotope position is not inside any volume.");
+    }
+    int counter = 0;
+    while (true)
+    {
+        G4double u = G4UniformRand(); // Random value in [0, 1)
+        G4double v = G4UniformRand();
+        G4double w = G4UniformRand();
+
+        // Generate spherical coordinates
+        G4double r = m_productionRadius * std::cbrt(u) * mm; // Scales radius for uniform distribution
+        G4double theta = std::acos(1 - 2 * v);               // Polar angle
+        G4double phi = 2 * CLHEP::pi * w;                    // Azimuthal angle
+
+        // Convert to Cartesian coordinates
+        G4double x = r * std::sin(theta) * std::cos(phi);
+        G4double y = r * std::sin(theta) * std::sin(phi);
+        G4double z = r * std::cos(theta);
+        G4ThreeVector randomPoint = G4ThreeVector(x, y, z) + centreOfVolume;
+        // Check if the random point is inside the same volume
+        G4VPhysicalVolume *locatedVolume = navigator->LocateGlobalPointAndSetup(randomPoint, nullptr, true);
+
+        if (currentVolume == locatedVolume)
+        {
+            if (counter > 100000)
+            {
+                log_error("Could not find next decay position. Exciting...");
+                G4Exception("sampleNextDecayPosition", "NoVolume", FatalException,
+                            "Could not find next decay position!");
+            }
+
+            return randomPoint;
+        }
+        counter++;
+    }
+}
diff --git a/simulations/radioactive_decays/src/OMSimG4VRadioactiveDecay.cc b/simulations/radioactive_decays/src/OMSimG4VRadioactiveDecay.cc
index fe214047c..c34e36cac 100644
--- a/simulations/radioactive_decays/src/OMSimG4VRadioactiveDecay.cc
+++ b/simulations/radioactive_decays/src/OMSimG4VRadioactiveDecay.cc
@@ -1017,6 +1017,7 @@ void G4VRadioactiveDecay::DecayAnalog(const G4Track& theTrack,
     G4double ParentEnergy = theParticle->GetKineticEnergy() + theParticle->GetParticleDefinition()->GetPDGMass();
     G4ThreeVector ParentDirection(theParticle->GetMomentumDirection());
 
+    G4bool randomisePosition = false;
     if (theTrack.GetTrackStatus() == fStopButAlive)
     {
         // this condition seems to be always True, further investigation is needed (L.Desorgher)
@@ -1036,8 +1037,10 @@ void G4VRadioactiveDecay::DecayAnalog(const G4Track& theTrack,
         ////OMSIM//////////////////////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////////////////////////
         G4double timeWindow = OMSimCommandArgsTable::getInstance().get<G4double>("time_window") * s;
+        
         if (finalGlobalTime > timeWindow)
         {
+            randomisePosition = true;
             temptime = G4UniformRand() * timeWindow;
             finalGlobalTime = temptime;
             finalLocalTime = temptime;
@@ -1080,10 +1083,19 @@ void G4VRadioactiveDecay::DecayAnalog(const G4Track& theTrack,
         G4PhysicsModelCatalog::GetModelID("model_RDM_AtomicRelaxation");
     for (G4int index = 0; index < numberOfSecondaries; ++index)
     {
-        G4Track *secondary = new G4Track(products->PopProducts(), finalGlobalTime,
-                                         theTrack.GetPosition());
+        G4DynamicParticle* nextProduct = products->PopProducts();
+        G4ThreeVector secondaryPosition = theTrack.GetPosition();
+
+        if (randomisePosition && nextProduct->GetParticleDefinition()-> GetParticleType() == "nucleus")
+        {
+          secondaryPosition = OMSimDecaysGPS::getInstance().sampleNextDecayPosition(theTrack.GetPosition());
+        }
+        G4Track *secondary = new G4Track(nextProduct, finalGlobalTime, secondaryPosition);
+
         secondary->SetWeight(theTrack.GetWeight());
         secondary->SetCreatorModelID(modelID);
+        
+        
         // Change for atomics relaxation
         if (theRadDecayMode == IT && index > 0)
         {